vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-01 10:09:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix correct shutdown of mdns packet listeners

Browse source
This commit is contained in:
Daniel 2020-06-03 21:29:18 +02:00
parent 328884c354
commit bb86496223
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resolver/mdns.go
View file

@ -69,7 +69,7 @@ func indexOfRR(entry *dns.RR_Header, list *[]dns.RR) int {
//nolint:gocyclo,gocognit // TODO: make simpler
func listenToMDNS(ctx context.Context) error {
var err error
messages := make(chan *dns.Msg)
messages := make(chan *dns.Msg, 32)
// TODO: init and start every listener in its own service worker
// this will make the more resilient and actually able to restart
@ -80,7 +80,7 @@ func listenToMDNS(ctx context.Context) error {
log.Warningf("intel(mdns): failed to create udp4 listen multicast socket: %s", err)
} else {
module.StartServiceWorker("mdns udp4 multicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(multicast4Conn, messages)
return listenForDNSPackets(ctx, multicast4Conn, messages)
})
defer multicast4Conn.Close()
}
@ -91,7 +91,7 @@ func listenToMDNS(ctx context.Context) error {
log.Warningf("intel(mdns): failed to create udp6 listen multicast socket: %s", err)
} else {
module.StartServiceWorker("mdns udp6 multicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(multicast6Conn, messages)
return listenForDNSPackets(ctx, multicast6Conn, messages)
})
defer multicast6Conn.Close()
}
@ -102,7 +102,7 @@ func listenToMDNS(ctx context.Context) error {
log.Warningf("intel(mdns): failed to create udp4 listen socket: %s", err)
} else {
module.StartServiceWorker("mdns udp4 unicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(unicast4Conn, messages)
return listenForDNSPackets(ctx, unicast4Conn, messages)
})
defer unicast4Conn.Close()
}
@ -113,7 +113,7 @@ func listenToMDNS(ctx context.Context) error {
log.Warningf("intel(mdns): failed to create udp6 listen socket: %s", err)
} else {
module.StartServiceWorker("mdns udp6 unicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(unicast6Conn, messages)
return listenForDNSPackets(ctx, unicast6Conn, messages)
})
defer unicast6Conn.Close()
}
@ -319,7 +319,7 @@ func handleMDNSMessages(ctx context.Context, messages chan *dns.Msg) error {
}
func listenForDNSPackets(conn *net.UDPConn, messages chan *dns.Msg) error {
func listenForDNSPackets(ctx context.Context, conn *net.UDPConn, messages chan *dns.Msg) error {
buf := make([]byte, 65536)
for {
n, err := conn.Read(buf)
@ -335,7 +335,11 @@ func listenForDNSPackets(conn *net.UDPConn, messages chan *dns.Msg) error {
log.Debugf("resolver: failed to unpack message: %s", err)
continue
}
messages <- message
select {
case messages <- message:
case <-ctx.Done():
return nil
}
}
}