From 9628839508c2df900b05aae8fc8b65b209fa516b Mon Sep 17 00:00:00 2001 From: Zoltan Papp Date: Wed, 16 Aug 2023 09:48:39 +0200 Subject: [PATCH] Clarify variable and func names --- client/internal/dns/server.go | 6 +++--- client/internal/dns/server_test.go | 8 ++++---- client/internal/dns/service.go | 4 ++-- client/internal/dns/service_listener.go | 24 ++++++++++++------------ client/internal/dns/service_memory.go | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go index 38d0a0bcc..07434ad54 100644 --- a/client/internal/dns/server.go +++ b/client/internal/dns/server.go @@ -132,7 +132,7 @@ func (s *DefaultServer) Initialize() (err error) { // 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) func (s *DefaultServer) DnsIP() string { - return s.service.ListenIp() + return s.service.RuntimeIP() } // Stop stops the server @@ -233,9 +233,9 @@ func (s *DefaultServer) applyConfiguration(update nbdns.Config) error { s.updateMux(muxUpdates) 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. " + "Learn more at: https://netbird.io/docs/how-to-guides/nameservers#local-resolver") s.currentConfig.routeAll = false diff --git a/client/internal/dns/server_test.go b/client/internal/dns/server_test.go index a5889a60c..73349de89 100644 --- a/client/internal/dns/server_test.go +++ b/client/internal/dns/server_test.go @@ -487,7 +487,7 @@ func TestDNSServerStartStop(t *testing.T) { d := net.Dialer{ 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) if err != nil { t.Log(err) @@ -603,7 +603,7 @@ func TestDNSPermanent_updateHostDNS_emptyUpstream(t *testing.T) { 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") if err != nil { t.Errorf("failed to resolve: %s", err) @@ -626,7 +626,7 @@ func TestDNSPermanent_updateUpstream(t *testing.T) { defer dnsServer.Stop() // 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") if err != nil { t.Errorf("failed to resolve: %s", err) @@ -718,7 +718,7 @@ func TestDNSPermanent_matchOnly(t *testing.T) { defer dnsServer.Stop() // 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") if err != nil { t.Errorf("failed to resolve: %s", err) diff --git a/client/internal/dns/service.go b/client/internal/dns/service.go index 2e2a7443c..523976e54 100644 --- a/client/internal/dns/service.go +++ b/client/internal/dns/service.go @@ -13,6 +13,6 @@ type service interface { Stop() RegisterMux(domain string, handler dns.Handler) DeregisterMux(key string) - ListenPort() int - ListenIp() string + RuntimePort() int + RuntimeIP() string } diff --git a/client/internal/dns/service_listener.go b/client/internal/dns/service_listener.go index 1f12f570a..228981504 100644 --- a/client/internal/dns/service_listener.go +++ b/client/internal/dns/service_listener.go @@ -26,8 +26,8 @@ type serviceViaListener struct { dnsMux *dns.ServeMux customAddr *netip.AddrPort server *dns.Server - runtimeIP string - runtimePort int + listenIP string + listenPort int listenerIsRunning bool listenerFlagLock sync.Mutex 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() } return s @@ -62,12 +62,12 @@ func (s *serviceViaListener) Listen() error { } var err error - s.runtimeIP, s.runtimePort, err = s.evalRuntimeAddress() + s.listenIP, s.listenPort, err = s.evalRuntimeAddress() if err != nil { log.Errorf("failed to eval runtime address: %s", 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) go func() { @@ -76,12 +76,12 @@ func (s *serviceViaListener) Listen() error { err := s.server.ListenAndServe() 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 { - err = s.ebpfService.LoadDNSFwd(s.runtimeIP, s.runtimePort) + if s.ebpfService != nil && s.listenPort != defaultPort { + err = s.ebpfService.LoadDNSFwd(s.listenIP, s.listenPort) if err != nil { return err } @@ -121,16 +121,16 @@ func (s *serviceViaListener) DeregisterMux(pattern string) { s.dnsMux.HandleRemove(pattern) } -func (s *serviceViaListener) ListenPort() int { +func (s *serviceViaListener) RuntimePort() int { if s.ebpfService != nil { return defaultPort } else { - return s.runtimePort + return s.listenPort } } -func (s *serviceViaListener) ListenIp() string { - return s.runtimeIP +func (s *serviceViaListener) RuntimeIP() string { + return s.listenIP } func (s *serviceViaListener) setListenerStatus(running bool) { diff --git a/client/internal/dns/service_memory.go b/client/internal/dns/service_memory.go index 8607cdf39..128dda840 100644 --- a/client/internal/dns/service_memory.go +++ b/client/internal/dns/service_memory.go @@ -48,7 +48,7 @@ func (s *serviceViaMemory) Listen() error { } s.listenerIsRunning = true - log.Debugf("dns service listening on: %s", s.ListenIp()) + log.Debugf("dns service listening on: %s", s.RuntimeIP()) return nil } @@ -75,11 +75,11 @@ func (s *serviceViaMemory) DeregisterMux(pattern string) { s.dnsMux.HandleRemove(pattern) } -func (s *serviceViaMemory) ListenPort() int { +func (s *serviceViaMemory) RuntimePort() int { return s.runtimePort } -func (s *serviceViaMemory) ListenIp() string { +func (s *serviceViaMemory) RuntimeIP() string { return s.runtimeIP }