From 0130dde9f9c6b7924902dc36c86b7de1d508ae70 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Wed, 12 Jan 2011 00:20:05 +0100
Subject: [PATCH] Figured out API for server side stuff

---
 responder/responder.go | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/responder/responder.go b/responder/responder.go
index 574f2333..d8518f90 100644
--- a/responder/responder.go
+++ b/responder/responder.go
@@ -15,7 +15,7 @@ import (
         "fmt"
 )
 
-type Responder struct {
+type Server struct {
 	Addresses []string            // interfaces to use
 	Port      string              // what port to use
 	Timeout   int                 // seconds before giving up on packet
@@ -23,6 +23,14 @@ type Responder struct {
 	Mangle    func([]byte) []byte // mangle the packet, before sending
 }
 
+// Every nameserver must implement the Handler interface.
+type Responder interface {
+        // Receives the raw message content
+        ResponderUDP(c *net.UDPConn, raddr net.Addr, in []byte)
+        // Receives the raw message content
+        ResponderTCP(c *net.TCPConn, raddr net.Addr, in []byte)
+}
+
 // When communicating with a resolver, we use this structure
 // to send packets to it, for sending Error must be nil.
 // A resolver responds with a reply packet and a possible error.
@@ -34,11 +42,15 @@ type DnsMsg struct {
 
 // This is a NAMESERVER
 // Communicate withit via a channel
-func (res *Responder) NewResponder() bool {
+// Interface UDPhandler - has function that gets called 
+// Interface TCPhandler - has function that gets called
+// NewResponder returns a channel, for communication (start/stop)
+// caN we use the channel for other stuff??
+func (res *Server) NewResponder(h Responder) (ch chan DnsMsg) {
 	var port string
 	if len(res.Addresses) == 0 {
 		// We cannot start responding with an addresss
-		return false
+		return nil
 	}
 	if res.Port == "" {
 		port = "53"
@@ -60,15 +72,14 @@ func (res *Responder) NewResponder() bool {
                 m = m[:n]
                 // If I don't pick off the remote addr, but do it in the Go routine
                 // I've created a race condition?? TODO(mg)
-                handlerUDP(res, c, raddr, m)
+                h.ResponderUDP(c, raddr, m)
 		c.Close()
 	}
-
-	return true
-
+	return nil
 }
 
-func handlerUDP(res *Responder, c *net.UDPConn, raddr net.Addr, in []byte) {
+// The raw packet
+func handlerUDP(c *net.UDPConn, raddr net.Addr, in []byte) {
 	// don't care what you've read, just blap a default, but put in the
 	// correct Id
         fmt.Printf("handlerUDP called!")
@@ -92,7 +103,3 @@ func handlerUDP(res *Responder, c *net.UDPConn, raddr net.Addr, in []byte) {
         out, _ := m.Pack()
         c.WriteTo(out, raddr)
 }
-
-func handlerTCP(res *Responder, c net.Conn, raddr net.Addr, in []byte) {
-
-}