From c9e35bb1baf18b281f47907cc12dad2dda381a0f Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Wed, 27 Jun 2018 11:23:39 +0200 Subject: [PATCH] fix localnameserver creation --- app/dns/nameserver.go | 8 ++++---- app/dns/server.go | 4 ++-- vendor/websocket | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go index 3c2aee64f..99a70a342 100644 --- a/app/dns/nameserver.go +++ b/app/dns/nameserver.go @@ -10,11 +10,11 @@ type NameServer interface { QueryIP(ctx context.Context, domain string) ([]net.IP, error) } -type LocalNameServer struct { +type localNameServer struct { resolver net.Resolver } -func (s *LocalNameServer) QueryIP(ctx context.Context, domain string) ([]net.IP, error) { +func (s *localNameServer) QueryIP(ctx context.Context, domain string) ([]net.IP, error) { ipAddr, err := s.resolver.LookupIPAddr(ctx, domain) if err != nil { return nil, err @@ -26,8 +26,8 @@ func (s *LocalNameServer) QueryIP(ctx context.Context, domain string) ([]net.IP, return ips, nil } -func NewLocalNameServer() *LocalNameServer { - return &LocalNameServer{ +func NewLocalNameServer() *localNameServer { + return &localNameServer{ resolver: net.Resolver{ PreferGo: true, }, diff --git a/app/dns/server.go b/app/dns/server.go index 84eda40ff..c86c0f9c2 100644 --- a/app/dns/server.go +++ b/app/dns/server.go @@ -44,7 +44,7 @@ func New(ctx context.Context, config *Config) (*Server, error) { for idx, destPB := range config.NameServers { address := destPB.Address.AsAddress() if address.Family().IsDomain() && address.Domain() == "localhost" { - server.servers[idx] = &LocalNameServer{} + server.servers[idx] = NewLocalNameServer() } else { dest := destPB.AsDestination() if dest.Network == net.Network_Unknown { @@ -56,7 +56,7 @@ func New(ctx context.Context, config *Config) (*Server, error) { } } if len(config.NameServers) == 0 { - server.servers = append(server.servers, &LocalNameServer{}) + server.servers = append(server.servers, NewLocalNameServer()) } return server, nil diff --git a/vendor/websocket b/vendor/websocket index 17ef92479..353d1e4e0 160000 --- a/vendor/websocket +++ b/vendor/websocket @@ -1 +1 @@ -Subproject commit 17ef924799bd76d2e939bb6ccf8356bdfb19671d +Subproject commit 353d1e4e044e28bcf2ce8dccd9056bfd3385dbb8