extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-07-02 23:52:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clarify variable and func names

Browse Source
This commit is contained in:
Zoltan Papp
2023-08-16 09:48:39 +02:00
parent 5288506c90
commit 9628839508
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ func (s *DefaultServer) Initialize() (err error) {
// When kernel space interface used it return real DNS server listener IP address // When kernel space interface used it return real DNS server listener IP address
// For bind interface, fake DNS resolver address returned (second last IP address from Nebird network) // For bind interface, fake DNS resolver address returned (second last IP address from Nebird network)
func (s *DefaultServer) DnsIP() string { func (s *DefaultServer) DnsIP() string {
return s.service.ListenIp() return s.service.RuntimeIP()
} }
// Stop stops the server // Stop stops the server
@ -233,9 +233,9 @@ func (s *DefaultServer) applyConfiguration(update nbdns.Config) error {
s.updateMux(muxUpdates) s.updateMux(muxUpdates)
s.updateLocalResolver(localRecords) s.updateLocalResolver(localRecords)
s.currentConfig = dnsConfigToHostDNSConfig(update, s.service.ListenIp(), s.service.ListenPort()) s.currentConfig = dnsConfigToHostDNSConfig(update, s.service.RuntimeIP(), s.service.RuntimePort())
if s.service.ListenPort() != defaultPort && !s.hostManager.supportCustomPort() { if s.service.RuntimePort() != defaultPort && !s.hostManager.supportCustomPort() {
log.Warnf("the DNS manager of this peer doesn't support custom port. Disabling primary DNS setup. " + 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") "Learn more at: https://netbird.io/docs/how-to-guides/nameservers#local-resolver")
s.currentConfig.routeAll = false s.currentConfig.routeAll = false

8
client/internal/dns/server_test.go
View File

@ -487,7 +487,7 @@ func TestDNSServerStartStop(t *testing.T) {
d := net.Dialer{ d := net.Dialer{
Timeout: time.Second * 5, Timeout: time.Second * 5,
} }
addr := fmt.Sprintf("%s:%d", dnsServer.service.ListenIp(), dnsServer.service.ListenPort()) addr := fmt.Sprintf("%s:%d", dnsServer.service.RuntimeIP(), dnsServer.service.RuntimePort())
conn, err := d.DialContext(ctx, network, addr) conn, err := d.DialContext(ctx, network, addr)
if err != nil { if err != nil {
t.Log(err) t.Log(err)
@ -603,7 +603,7 @@ func TestDNSPermanent_updateHostDNS_emptyUpstream(t *testing.T) {
dnsServer.OnUpdatedHostDNSServer([]string{"8.8.8.8"}) dnsServer.OnUpdatedHostDNSServer([]string{"8.8.8.8"})
resolver := newDnsResolver(dnsServer.service.ListenIp(), dnsServer.service.ListenPort()) resolver := newDnsResolver(dnsServer.service.RuntimeIP(), dnsServer.service.RuntimePort())
_, err = resolver.LookupHost(context.Background(), "netbird.io") _, err = resolver.LookupHost(context.Background(), "netbird.io")
if err != nil { if err != nil {
t.Errorf("failed to resolve: %s", err) t.Errorf("failed to resolve: %s", err)
@ -626,7 +626,7 @@ func TestDNSPermanent_updateUpstream(t *testing.T) {
defer dnsServer.Stop() defer dnsServer.Stop()
// check initial state // check initial state
resolver := newDnsResolver(dnsServer.service.ListenIp(), dnsServer.service.ListenPort()) resolver := newDnsResolver(dnsServer.service.RuntimeIP(), dnsServer.service.RuntimePort())
_, err = resolver.LookupHost(context.Background(), "netbird.io") _, err = resolver.LookupHost(context.Background(), "netbird.io")
if err != nil { if err != nil {
t.Errorf("failed to resolve: %s", err) t.Errorf("failed to resolve: %s", err)
@ -718,7 +718,7 @@ func TestDNSPermanent_matchOnly(t *testing.T) {
defer dnsServer.Stop() defer dnsServer.Stop()
// check initial state // check initial state
resolver := newDnsResolver(dnsServer.service.ListenIp(), dnsServer.service.ListenPort()) resolver := newDnsResolver(dnsServer.service.RuntimeIP(), dnsServer.service.RuntimePort())
_, err = resolver.LookupHost(context.Background(), "netbird.io") _, err = resolver.LookupHost(context.Background(), "netbird.io")
if err != nil { if err != nil {
t.Errorf("failed to resolve: %s", err) t.Errorf("failed to resolve: %s", err)

4
client/internal/dns/service.go
View File

@ -13,6 +13,6 @@ type service interface {
Stop() Stop()
RegisterMux(domain string, handler dns.Handler) RegisterMux(domain string, handler dns.Handler)
DeregisterMux(key string) DeregisterMux(key string)
ListenPort() int RuntimePort() int
ListenIp() string RuntimeIP() string
} }

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

@ -26,8 +26,8 @@ type serviceViaListener struct {
dnsMux *dns.ServeMux dnsMux *dns.ServeMux
customAddr *netip.AddrPort customAddr *netip.AddrPort
server *dns.Server server *dns.Server
runtimeIP string listenIP string
runtimePort int listenPort int
listenerIsRunning bool listenerIsRunning bool
listenerFlagLock sync.Mutex listenerFlagLock sync.Mutex
ebpfService *ebpf.Manager ebpfService *ebpf.Manager
@ -47,7 +47,7 @@ func newServiceViaListener(wgIface WGIface, customAddr *netip.AddrPort) *service
}, },
} }
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" && customAddr != nil {
s.ebpfService = ebpf.GetEbpfManagerInstance() s.ebpfService = ebpf.GetEbpfManagerInstance()
} }
return s return s
@ -62,12 +62,12 @@ func (s *serviceViaListener) Listen() error {
} }
var err error var err error
s.runtimeIP, s.runtimePort, err = s.evalRuntimeAddress() s.listenIP, s.listenPort, err = s.evalRuntimeAddress()
if err != nil { if err != nil {
log.Errorf("failed to eval runtime address: %s", err) log.Errorf("failed to eval runtime address: %s", err)
return err return err
} }
s.server.Addr = fmt.Sprintf("%s:%d", s.runtimeIP, s.runtimePort) s.server.Addr = fmt.Sprintf("%s:%d", s.listenIP, s.listenPort)
log.Debugf("starting dns on %s", s.server.Addr) log.Debugf("starting dns on %s", s.server.Addr)
go func() { go func() {
@ -76,12 +76,12 @@ func (s *serviceViaListener) Listen() error {
err := s.server.ListenAndServe() err := s.server.ListenAndServe()
if err != nil { if err != nil {
log.Errorf("dns server running with %d port returned an error: %v. Will not retry", s.runtimePort, err) log.Errorf("dns server running with %d port returned an error: %v. Will not retry", s.listenPort, err)
} }
}() }()
if s.ebpfService != nil && s.runtimePort != defaultPort { if s.ebpfService != nil && s.listenPort != defaultPort {
err = s.ebpfService.LoadDNSFwd(s.runtimeIP, s.runtimePort) err = s.ebpfService.LoadDNSFwd(s.listenIP, s.listenPort)
if err != nil { if err != nil {
return err return err
} }
@ -121,16 +121,16 @@ func (s *serviceViaListener) DeregisterMux(pattern string) {
s.dnsMux.HandleRemove(pattern) s.dnsMux.HandleRemove(pattern)
} }
func (s *serviceViaListener) ListenPort() int { func (s *serviceViaListener) RuntimePort() int {
if s.ebpfService != nil { if s.ebpfService != nil {
return defaultPort return defaultPort
} else { } else {
return s.runtimePort return s.listenPort
} }
} }
func (s *serviceViaListener) ListenIp() string { func (s *serviceViaListener) RuntimeIP() string {
return s.runtimeIP return s.listenIP
} }
func (s *serviceViaListener) setListenerStatus(running bool) { func (s *serviceViaListener) setListenerStatus(running bool) {

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

@ -48,7 +48,7 @@ func (s *serviceViaMemory) Listen() error {
} }
s.listenerIsRunning = true s.listenerIsRunning = true
log.Debugf("dns service listening on: %s", s.ListenIp()) log.Debugf("dns service listening on: %s", s.RuntimeIP())
return nil return nil
} }
@ -75,11 +75,11 @@ func (s *serviceViaMemory) DeregisterMux(pattern string) {
s.dnsMux.HandleRemove(pattern) s.dnsMux.HandleRemove(pattern)
} }
func (s *serviceViaMemory) ListenPort() int { func (s *serviceViaMemory) RuntimePort() int {
return s.runtimePort return s.runtimePort
} }
func (s *serviceViaMemory) ListenIp() string { func (s *serviceViaMemory) RuntimeIP() string {
return s.runtimeIP return s.runtimeIP
} }