extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-12-12 18:00:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix runtime/listen port logic

Browse Source
This commit is contained in:
Zoltan Papp 2023-08-15 17:01:01 +02:00
parent 4b73828c6d
commit 5288506c90
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/internal/dns/server.go
View File

@ -235,6 +235,12 @@ func (s *DefaultServer) applyConfiguration(update nbdns.Config) error {
s.updateLocalResolver(localRecords)
s.currentConfig = dnsConfigToHostDNSConfig(update, s.service.ListenIp(), s.service.ListenPort())
if s.service.ListenPort() != defaultPort && !s.hostManager.supportCustomPort() {
log.Warnf("the DNS manager of this peer doesn't support custom port. Disabling primary DNS setup. " +
"Learn more at: https://netbird.io/docs/how-to-guides/nameservers#local-resolver")
s.currentConfig.routeAll = false
}
if err = s.hostManager.applyDNSConfig(s.currentConfig); err != nil {
log.Error(err)
}

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

@ -45,7 +45,10 @@ func newServiceViaListener(wgIface WGIface, customAddr *netip.AddrPort) *service
Handler: mux,
UDPSize: 65535,
},
ebpfService: ebpf.GetEbpfManagerInstance(),
}
if runtime.GOOS == "linux" {
s.ebpfService = ebpf.GetEbpfManagerInstance()
}
return s
}
@ -77,7 +80,7 @@ func (s *serviceViaListener) Listen() error {
}
}()
if s.runtimePort != defaultPort {
if s.ebpfService != nil && s.runtimePort != defaultPort {
err = s.ebpfService.LoadDNSFwd(s.runtimeIP, s.runtimePort)
if err != nil {
return err
@ -102,9 +105,11 @@ func (s *serviceViaListener) Stop() {
log.Errorf("stopping dns server listener returned an error: %v", err)
}
err = s.ebpfService.FreeDNSFwd()
if err != nil {
log.Errorf("stopping traffic forwarder returned an error: %v", err)
if s.ebpfService != nil {
err = s.ebpfService.FreeDNSFwd()
if err != nil {
log.Errorf("stopping traffic forwarder returned an error: %v", err)
}
}
}
@ -117,7 +122,11 @@ func (s *serviceViaListener) DeregisterMux(pattern string) {
}
func (s *serviceViaListener) ListenPort() int {
return defaultPort
if s.ebpfService != nil {
return defaultPort
} else {
return s.runtimePort
}
}
func (s *serviceViaListener) ListenIp() string {