From ea180d505199886601bad72381cc5fe89b48c1ef Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Tue, 8 Feb 2011 21:26:40 +0100
Subject: [PATCH] All together now

Responder renamed to server and folded back into the
main dns package
---
 Makefile  | 10 +---------
 server.go | 15 +++------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 7506dbeb..9a6f5692 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ GOFILES=\
 	nsec3.go\
 	resolver.go\
 	config.go\
-	responder.go
+	server.go
 #	y.go\
 
 include $(GOROOT)/src/Make.pkg
@@ -26,14 +26,6 @@ include $(GOROOT)/src/Make.pkg
 #y.go:	dns.y
 #	goyacc dns.y
 
-
-all: package
-	gomake -C responder package
-
-dnstest:
-	gotest
-	gomake -C responder test
-
 _examples:
 	gomake -C _examples
 
diff --git a/server.go b/server.go
index c9ab2548..8e7992f6 100644
--- a/server.go
+++ b/server.go
@@ -20,22 +20,13 @@
 //         var m *myserv                       
 //         ch :=make(chan bool)
 //         go s.NewResponder(m, ch)     // start the responder
-package responder
+package dns
 
 import (
 	"os"
 	"net"
-	"dns"
 )
 
-type msg struct {
-	udp  *net.UDPConn // udp conn
-	tcp  *net.TCPConn // tcp conn
-	addr net.Addr     // remote address
-	msg  []byte       // raw dns message
-	err  os.Error     // any errors
-}
-
 // Every nameserver implements the Hander interface. It defines
 // the kind of nameserver
 type Handler interface {
@@ -56,7 +47,7 @@ func ServeUDP(l *net.UDPConn, handler Handler) os.Error {
                 // handler == DefaultServer
         }
 	for {
-		m := make([]byte, dns.DefaultMsgSize) // TODO(mg) out of this loop?
+		m := make([]byte, DefaultMsgSize) // TODO(mg) out of this loop?
 		n, radd, err := l.ReadFromUDP(m)
 		if err != nil {
 			return err
@@ -84,7 +75,7 @@ func ServeTCP(l *net.TCPListener, handler Handler) os.Error {
 		}
 		length := uint16(b[0])<<8 | uint16(b[1])
 		if length == 0 {
-			return &dns.Error{Error: "received nil msg length"}
+			return &Error{Error: "received nil msg length"}
 		}
 		m := make([]byte, length)