diff options
Diffstat (limited to 'core/dnsserver/server.go')
| -rw-r--r-- | core/dnsserver/server.go | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/core/dnsserver/server.go b/core/dnsserver/server.go index 2d018ecc7..a112e4f5b 100644 --- a/core/dnsserver/server.go +++ b/core/dnsserver/server.go @@ -25,13 +25,11 @@ import ( // the same address and the listener may be stopped for // graceful termination (POSIX only). type Server struct { - Addr string // Address we listen on - mux *dns.ServeMux - server [2]*dns.Server // 0 is a net.Listener, 1 is a net.PacketConn (a *UDPConn) in our case. + Addr string // Address we listen on + mux *dns.ServeMux - l net.Listener - p net.PacketConn - m sync.Mutex // protects listener and packetconn + server [2]*dns.Server // 0 is a net.Listener, 1 is a net.PacketConn (a *UDPConn) in our case. + m sync.Mutex // protects the servers zones map[string]*Config // zones keyed by their address dnsWg sync.WaitGroup // used to wait on outstanding connections @@ -99,9 +97,6 @@ func (s *Server) Listen() (net.Listener, error) { if err != nil { return nil, err } - s.m.Lock() - s.l = l - s.m.Unlock() return l, nil } @@ -112,9 +107,6 @@ func (s *Server) ListenPacket() (net.PacketConn, error) { return nil, err } - s.m.Lock() - s.p = p - s.m.Unlock() return p, nil } @@ -145,13 +137,6 @@ func (s *Server) Stop() (err error) { // Close the listener now; this stops the server without delay s.m.Lock() - if s.l != nil { - err = s.l.Close() - } - if s.p != nil { - err = s.p.Close() - } - for _, s1 := range s.server { // We might not have started and initialized the full set of servers if s1 != nil { |