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

Fix eBPF apply logic

Browse Source
This commit is contained in:
Zoltan Papp 2023-08-16 09:56:46 +02:00
parent 9628839508
commit 56879517f1
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,9 +47,6 @@ func newServiceViaListener(wgIface WGIface, customAddr *netip.AddrPort) *service
}, },
} }
if runtime.GOOS == "linux" && customAddr != nil {
s.ebpfService = ebpf.GetEbpfManagerInstance()
}
return s return s
} }
@ -69,6 +66,14 @@ func (s *serviceViaListener) Listen() error {
} }
s.server.Addr = fmt.Sprintf("%s:%d", s.listenIP, s.listenPort) s.server.Addr = fmt.Sprintf("%s:%d", s.listenIP, s.listenPort)
if s.shouldApplyPortFwd() {
s.ebpfService = ebpf.GetEbpfManagerInstance()
err = s.ebpfService.LoadDNSFwd(s.listenIP, s.listenPort)
if err != nil {
log.Warnf("failed to load DNS port fwd, custom port may not support well: %s", err)
s.ebpfService = nil
}
}
log.Debugf("starting dns on %s", s.server.Addr) log.Debugf("starting dns on %s", s.server.Addr)
go func() { go func() {
s.setListenerStatus(true) s.setListenerStatus(true)
@ -80,12 +85,6 @@ func (s *serviceViaListener) Listen() error {
} }
}() }()
if s.ebpfService != nil && s.listenPort != defaultPort {
err = s.ebpfService.LoadDNSFwd(s.listenIP, s.listenPort)
if err != nil {
return err
}
}
return nil return nil
} }
@ -122,6 +121,9 @@ func (s *serviceViaListener) DeregisterMux(pattern string) {
} }
func (s *serviceViaListener) RuntimePort() int { func (s *serviceViaListener) RuntimePort() int {
s.listenerFlagLock.Lock()
defer s.listenerFlagLock.Unlock()
if s.ebpfService != nil { if s.ebpfService != nil {
return defaultPort return defaultPort
} else { } else {
@ -168,3 +170,18 @@ func (s *serviceViaListener) evalRuntimeAddress() (string, int, error) {
return s.getFirstListenerAvailable() return s.getFirstListenerAvailable()
} }
func (s *serviceViaListener) shouldApplyPortFwd() bool {
if runtime.GOOS != "linux" {
return false
}
if s.customAddr != nil {
return false
}
if s.listenPort == defaultPort {
return false
}
return true
}