newConn is useless

This commit is contained in:
Miek Gieben 2012-10-09 21:38:17 +02:00
parent f38ce1b9b5
commit 8a49e9da90
1 changed files with 2 additions and 20 deletions

View File

@ -333,10 +333,7 @@ forever:
i += j
}
n = i
d, err := newConn(rw, nil, rw.RemoteAddr(), m, handler, srv.TsigSecret)
if err != nil {
continue
}
d := &conn{rw.RemoteAddr(), handler, m, nil, rw, srv.TsigSecret}
go d.serve()
}
panic("dns: not reached")
@ -367,27 +364,12 @@ func (srv *Server) serveUDP(l *net.UDPConn) error {
continue
}
m = m[:n]
d, err := newConn(nil, l, a, m, handler, srv.TsigSecret)
if err != nil {
continue
}
d := &conn{a, handler, m, l, nil, srv.TsigSecret}
go d.serve()
}
panic("dns: not reached")
}
func newConn(t *net.TCPConn, u *net.UDPConn, a net.Addr, buf []byte, handler Handler, tsig map[string]string) (*conn, error) {
c := new(conn)
c.handler = handler
c._TCP = t
c._UDP = u
c.remoteAddr = a
c.request = buf
c.tsigSecret = tsig
return c, nil
}
// Serve a new connection.
func (c *conn) serve() {
// for block to make it easy to break out to close the tcp connection