reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zettio/weave#366 - minor: fixed a typo and removed some superfluous code

Browse Source
This commit is contained in:
Alvaro Saurin committed 2015-02-26 10:51:48 +01:00
1 parent 403520f4b6
commit 0bc3e333f8
2 files changed
+8 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

nameserver/server.go
+6 -30
View File
@@ -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...")
weavedns/main.go
+2 -2
View File
@@ -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()