From 8a49e9da90a491f4a28cac456d4bfc9527d75fa2 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Tue, 9 Oct 2012 21:38:17 +0200
Subject: [PATCH] newConn is useless

---
 server.go | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/server.go b/server.go
index d830175c..ae3cd66e 100644
--- a/server.go
+++ b/server.go
@@ -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