extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-19 17:31:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

getFirstListenerAvailable(): adjust logging levels and add success message (#1513)

Browse Source 
it was worrying to see multiple warnings and no success message when lacking CAP_NET_BIND_SERVICE
This commit is contained in:
Krzysztof Nazarewski 2024-01-31 11:20:18 +01:00 committed by GitHub
parent 846d486366
commit b6835d9467
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/internal/dns/service_listener.go
View File

@ -140,7 +140,7 @@ func (s *serviceViaListener) setListenerStatus(running bool) {
s.listenerIsRunning = running s.listenerIsRunning = running
} }
func (s *serviceViaListener) getFirstListenerAvailable() (string, int, error) { func (s *serviceViaListener) getFirstDNSListenerAvailable() (string, int, error) {
ips := []string{defaultIP, customIP} ips := []string{defaultIP, customIP}
if runtime.GOOS != "darwin" { if runtime.GOOS != "darwin" {
ips = append([]string{s.wgInterface.Address().IP.String()}, ips...) ips = append([]string{s.wgInterface.Address().IP.String()}, ips...)
@ -156,9 +156,10 @@ func (s *serviceViaListener) getFirstListenerAvailable() (string, int, error) {
if err != nil { if err != nil {
log.Errorf("got an error closing the probe listener, error: %s", err) log.Errorf("got an error closing the probe listener, error: %s", err)
} }
log.Infof("successfully found dns binding candidate at %s", addrString)
return ip, port, nil return ip, port, nil
} }
log.Warnf("binding dns on %s is not available, error: %s", addrString, err) log.Debugf("binding dns on %s is not available, error: %s", addrString, err)
} }
} }
return "", 0, fmt.Errorf("unable to find an unused ip and port combination. IPs tested: %v and ports %v", ips, ports) return "", 0, fmt.Errorf("unable to find an unused ip and port combination. IPs tested: %v and ports %v", ips, ports)
@ -169,7 +170,7 @@ func (s *serviceViaListener) evalListenAddress() (string, int, error) {
return s.customAddr.Addr().String(), int(s.customAddr.Port()), nil return s.customAddr.Addr().String(), int(s.customAddr.Port()), nil
} }
return s.getFirstListenerAvailable() return s.getFirstDNSListenerAvailable()
} }
// shouldApplyPortFwd decides whether to apply eBPF program to capture DNS traffic on port 53. // shouldApplyPortFwd decides whether to apply eBPF program to capture DNS traffic on port 53.