lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radvd: gather details about the interface on SIGUSR1

Browse Source 
The interface might have a new MAC address (if radvd was started before netconfigd).
This commit is contained in:
Michael Stapelberg 2018-07-16 22:46:49 +02:00
parent 49a59779f5
commit c5e5a0eee0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/radvd/radvd.go
View File

@ -31,6 +31,7 @@ import (
type Server struct { type Server struct {
pc *ipv6.PacketConn pc *ipv6.PacketConn
ifname string
mu sync.Mutex mu sync.Mutex
prefixes []net.IPNet prefixes []net.IPNet
@ -43,6 +44,15 @@ func NewServer() (*Server, error) {
func (s *Server) SetPrefixes(prefixes []net.IPNet) { func (s *Server) SetPrefixes(prefixes []net.IPNet) {
s.mu.Lock() s.mu.Lock()
if s.ifname != "" {
var err error
// Gather details about the interface again, the MAC address might have been
// changed.
s.iface, err = net.InterfaceByName(s.ifname)
if err != nil {
log.Fatal(err) // interface vanished
}
}
s.prefixes = prefixes s.prefixes = prefixes
s.mu.Unlock() s.mu.Unlock()
if s.iface != nil { if s.iface != nil {
@ -52,6 +62,7 @@ func (s *Server) SetPrefixes(prefixes []net.IPNet) {
func (s *Server) Serve(ifname string, conn net.PacketConn) error { func (s *Server) Serve(ifname string, conn net.PacketConn) error {
var err error var err error
s.ifname = ifname
s.iface, err = net.InterfaceByName(ifname) s.iface, err = net.InterfaceByName(ifname)
if err != nil { if err != nil {
return err return err
@ -180,6 +191,8 @@ var ipv6LinkLocal = func(cidr string) *net.IPNet {
}("fe80::/10") }("fe80::/10")
func (s *Server) sendAdvertisement(addr net.Addr) error { func (s *Server) sendAdvertisement(addr net.Addr) error {
s.mu.Lock()
defer s.mu.Unlock()
if s.prefixes == nil { if s.prefixes == nil {
return nil // nothing to do return nil // nothing to do
} }
@ -199,7 +212,6 @@ func (s *Server) sendAdvertisement(addr net.Addr) error {
(sourceLinkLayerAddress{address: s.iface.HardwareAddr}).Marshal(), (sourceLinkLayerAddress{address: s.iface.HardwareAddr}).Marshal(),
(mtu{mtu: uint32(s.iface.MTU)}).Marshal(), (mtu{mtu: uint32(s.iface.MTU)}).Marshal(),
} }
s.mu.Lock()
for _, prefix := range s.prefixes { for _, prefix := range s.prefixes {
ones, _ := prefix.Mask.Size() ones, _ := prefix.Mask.Size()
// Use the first /64 subnet within larger prefixes // Use the first /64 subnet within larger prefixes
@ -240,7 +252,6 @@ func (s *Server) sendAdvertisement(addr net.Addr) error {
}).Marshal()) }).Marshal())
} }
} }
s.mu.Unlock()
buf := gopacket.NewSerializeBuffer() buf := gopacket.NewSerializeBuffer()
if err := options.SerializeTo(buf, gopacket.SerializeOptions{FixLengths: true}); err != nil { if err := options.SerializeTo(buf, gopacket.SerializeOptions{FixLengths: true}); err != nil {