From 0bc3e333f8ffa8e1b65a3503192e3fdaac7ae301 Mon Sep 17 00:00:00 2001
From: Alvaro Saurin <alvaro.saurin@gmail.com>
Date: Mon, 23 Feb 2015 12:40:29 +0100
Subject: [PATCH] zettio/weave#366 - minor: fixed a typo and removed some
 superfluous code

---
 nameserver/server.go | 36 ++++++------------------------------
 weavedns/main.go     |  4 ++--
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/nameserver/server.go b/nameserver/server.go
index 18c813bb..ddaa22a9 100644
--- a/nameserver/server.go
+++ b/nameserver/server.go
@@ -25,7 +25,7 @@ func makeDNSFailResponse(r *dns.Msg) *dns.Msg {
 
 type DNSServerConfig struct {
 	// (Optional) client config file for resolving upstream servers
-	UpstreamCfgFIle string
+	UpstreamCfgFile string
 	// (Optional) DNS client config for the fallback server(s)
 	UpstreamCfg *dns.ClientConfig
 	// DNS zone served
@@ -58,11 +58,11 @@ func NewDNSServer(config DNSServerConfig) (s *DNSServer, err error) {
 	if len(config.LocalDomain) == 0 {
 		config.LocalDomain = DEFAULT_LOCAL_DOMAIN
 	}
-	if len(config.UpstreamCfgFIle) == 0 {
-		config.UpstreamCfgFIle = DEFAULT_CLI_CFG_FILE
+	if len(config.UpstreamCfgFile) == 0 {
+		config.UpstreamCfgFile = DEFAULT_CLI_CFG_FILE
 	}
 	if config.UpstreamCfg == nil {
-		if config.UpstreamCfg, err = dns.ClientConfigFromFile(config.UpstreamCfgFIle); err != nil {
+		if config.UpstreamCfg, err = dns.ClientConfigFromFile(config.UpstreamCfgFile); err != nil {
 			return nil, err
 		}
 	}
@@ -105,30 +105,6 @@ func NewDNSServer(config DNSServerConfig) (s *DNSServer, err error) {
 	return
 }
 
-// Start the DNS server
-func (s *DNSServer) Start() error {
-	Info.Printf("Using mDNS on %s", s.IfaceName)
-	err := s.mdnsCli.Start(s.config.Iface)
-	CheckFatal(err)
-	err = s.mdnsSrv.Start(s.config.Iface, s.config.LocalDomain)
-	CheckFatal(err)
-
-	// create two DNS request multiplexerers, depending on the protocol used by clients
-	// (we use the same protocol for asking upstream servers)
-	mux := func(client *dns.Client) *dns.ServeMux {
-		m := dns.NewServeMux()
-		m.HandleFunc(s.config.LocalDomain, s.queryHandler([]Lookup{s.config.Zone, s.mdnsCli}))
-		m.HandleFunc(RDNS_DOMAIN, s.rdnsHandler([]Lookup{s.config.Zone, s.mdnsCli}, client))
-		m.HandleFunc(".", s.notUsHandler(client))
-		return m
-	}
-
-	s.udpSrv = &dns.Server{Addr: s.ListenAddr, Net: "udp", Handler: mux(&dns.Client{Net: "udp", UDPSize: DEFAULT_UDP_BUFLEN})}
-	s.tcpSrv = &dns.Server{Addr: s.ListenAddr, Net: "tcp", Handler: mux(&dns.Client{Net: "tcp"})}
-
-	return
-}
-
 // Start the DNS server
 func (s *DNSServer) Start() error {
 	Info.Printf("Using mDNS on %s", s.IfaceName)
@@ -143,7 +119,7 @@ func (s *DNSServer) Start() error {
 	go func() {
 		defer wg.Done()
 
-		Debug.Printf("Listening for DNS on %s (UDP)", address)
+		Debug.Printf("Listening for DNS on %s (UDP)", s.ListenAddr)
 		err = s.udpSrv.ListenAndServe()
 		CheckFatal(err)
 		Debug.Printf("DNS UDP server exiting...")
@@ -152,7 +128,7 @@ func (s *DNSServer) Start() error {
 	go func() {
 		defer wg.Done()
 
-		Debug.Printf("Listening for DNS on %s (TCP)", address)
+		Debug.Printf("Listening for DNS on %s (TCP)", s.ListenAddr)
 		err = s.tcpSrv.ListenAndServe()
 		CheckFatal(err)
 		Debug.Printf("DNS TCP server exiting...")
diff --git a/weavedns/main.go b/weavedns/main.go
index 384e00a8..6474be80 100644
--- a/weavedns/main.go
+++ b/weavedns/main.go
@@ -32,11 +32,11 @@ func main() {
 	flag.BoolVar(&justVersion, "version", false, "print version and exit")
 	flag.StringVar(&ifaceName, "iface", "", "name of interface to use for multicast")
 	flag.StringVar(&apiPath, "api", "unix:///var/run/docker.sock", "Path to Docker API socket")
-	flag.StringVar(&localDomain, "localDomain", weavedns.DEFAULT_LOCAL_DOMAIN, "local domain (ie, 'weave.local.')")
+	flag.StringVar(&localDomain, "localDomain", "", "local domain (ie, 'weave.local.')")
 	flag.IntVar(&wait, "wait", 0, "number of seconds to wait for interface to be created and come up")
 	flag.IntVar(&dnsPort, "dnsport", 53, "port to listen to DNS requests")
 	flag.IntVar(&httpPort, "httpport", 6785, "port to listen to HTTP requests")
-	flag.StringVar(&fallback, "fallback", "", "Fallback server and port (ie, '8.8.8.8:53')")
+	flag.StringVar(&fallback, "fallback", "", "fallback server and port (ie, '8.8.8.8:53')")
 	flag.BoolVar(&watch, "watch", true, "watch the docker socket for container events")
 	flag.BoolVar(&debug, "debug", false, "output debugging info to stderr")
 	flag.Parse()