a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dnsforward library -- consistently nullify and close listening socket when we're done with it.

This commit is contained in:
Eugene Bujak 2018-11-28 16:28:28 +03:00
parent 639b34c7d1
commit 7944f23d95
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dnsforward/dnsforward.go
View File

@ -97,6 +97,16 @@ func (s *Server) packetLoop() {
if err != nil {
if isConnClosed(err) {
log.Printf("ReadFrom() returned because we're reading from a closed connection, exiting loop")
var err error
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
log.Printf("Failed to close udp connection while exiting loop: %s", err)
}
break
}
log.Printf("Got error when reading from udp listen: %s", err)
@ -124,6 +134,7 @@ func (s *Server) Start(config *ServerConfig) error {
}
s.udpListen, err = net.ListenUDP("udp", addr)
if err != nil {
s.udpListen = nil
return errorx.Decorate(err, "Couldn't listen to UDP socket")
}
log.Println(s.udpListen.LocalAddr(), s.UDPListenAddr)
@ -144,10 +155,10 @@ func (s *Server) Stop() error {
defer s.Unlock()
if s.udpListen != nil {
err := s.udpListen.Close()
s.udpListen = nil
if err != nil {
return errorx.Decorate(err, "Couldn't close UDP listening socket")
}
s.udpListen = nil
}
return nil
}
@ -188,6 +199,7 @@ func (s *Server) reconfigureListenAddr(new ServerConfig) error {
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {
@ -198,6 +210,7 @@ func (s *Server) reconfigureListenAddr(new ServerConfig) error {
s.Lock()
if s.udpListen != nil {
err = s.udpListen.Close()
s.udpListen = nil
}
s.Unlock()
if err != nil {