From 0f492b563e144ed0119802856a9db21e1a92589e Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 17 Mar 2015 17:42:16 +0000
Subject: [PATCH] Fix test compilation

Tests weren't compiling due to change of ListenHttp() signature. Fixed
for now by reintroducing domain parameter in addition to server, as this
allows the HTTP tests to pass in a nil server parameter. In the long
term DNSServer should probably become an interface so we can mock it
easily in such a scenario.
---
 nameserver/http.go      | 6 +++---
 nameserver/http_test.go | 2 +-
 weavedns/main.go        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nameserver/http.go b/nameserver/http.go
index 5f22f5a7..d4a4d4c1 100644
--- a/nameserver/http.go
+++ b/nameserver/http.go
@@ -17,7 +17,7 @@ func httpErrorAndLog(level *log.Logger, w http.ResponseWriter, msg string,
 	level.Printf("[http] "+logmsg, logargs...)
 }
 
-func ListenHttp(version string, server *DNSServer, db Zone, port int) {
+func ListenHttp(version string, server *DNSServer, domain string, db Zone, port int) {
 
 	router := mux.NewRouter()
 
@@ -47,7 +47,7 @@ func ListenHttp(version string, server *DNSServer, db Zone, port int) {
 			return
 		}
 
-		if dns.IsSubDomain(server.Domain, name) {
+		if dns.IsSubDomain(domain, name) {
 			Info.Printf("[http] Adding %s -> %s", name, ipStr)
 			if err := db.AddRecord(ident, name, ip); err != nil {
 				if _, ok := err.(DuplicateError); !ok {
@@ -58,7 +58,7 @@ func ListenHttp(version string, server *DNSServer, db Zone, port int) {
 				} // oh, I already know this. whatever.
 			}
 		} else {
-			Info.Printf("[http] Ignoring name %s, not in %s", name, server.Domain)
+			Info.Printf("[http] Ignoring name %s, not in %s", name, domain)
 		}
 	})
 
diff --git a/nameserver/http_test.go b/nameserver/http_test.go
index fd613861..6a72b6c6 100644
--- a/nameserver/http_test.go
+++ b/nameserver/http_test.go
@@ -30,7 +30,7 @@ func TestHttp(t *testing.T) {
 	var zone = new(ZoneDb)
 	port := rand.Intn(10000) + 32768
 	fmt.Println("Http test on port", port)
-	go ListenHttp(testDomain, zone, port)
+	go ListenHttp("", nil, testDomain, zone, port)
 
 	time.Sleep(100 * time.Millisecond) // Allow for http server to get going
 
diff --git a/weavedns/main.go b/weavedns/main.go
index 62ea0f67..53ddd987 100644
--- a/weavedns/main.go
+++ b/weavedns/main.go
@@ -87,7 +87,7 @@ func main() {
 	if err != nil {
 		Error.Fatal("Failed to initialize the WeaveDNS server", err)
 	}
-	go weavedns.ListenHttp(version, srv, zone, httpPort)
+	go weavedns.ListenHttp(version, srv, localDomain, zone, httpPort)
 	err = srv.Start()
 	if err != nil {
 		Error.Fatal("Failed to start the WeaveDNS server", err)