zettio/weave#366 - improved configuration for th DNSServer, where we can specify the local domain name among other things... (missing some unit tests for this customized local domain)
This commit is contained in:
1 parent
d1400bc233
commit
bbd69170f9
5 files changed
+99
-47
No files matched your search
@@ -35,7 +35,7 @@ func (s *MDNSServer) addrIsLocal(testaddr net.Addr) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *MDNSServer) Start(ifi *net.Interface) error {
|
func (s *MDNSServer) Start(ifi *net.Interface, localDomain string) error {
|
||||||
conn, err := LinkLocalMulticastListener(ifi)
|
conn, err := LinkLocalMulticastListener(ifi)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -69,7 +69,7 @@ func (s *MDNSServer) Start(ifi *net.Interface) error {
|
|||||||
})
|
})
|
||||||
|
|
||||||
mux := dns.NewServeMux()
|
mux := dns.NewServeMux()
|
||||||
mux.HandleFunc(LOCAL_DOMAIN, handleLocal)
|
mux.HandleFunc(localDomain, handleLocal)
|
||||||
mux.HandleFunc(RDNS_DOMAIN, handleReverse)
|
mux.HandleFunc(RDNS_DOMAIN, handleReverse)
|
||||||
|
|
||||||
go dns.ActivateAndServe(nil, conn, mux)
|
go dns.ActivateAndServe(nil, conn, mux)
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ func TestServerSimpleQuery(t *testing.T) {
|
|||||||
|
|
||||||
mdnsServer, err := NewMDNSServer(zone)
|
mdnsServer, err := NewMDNSServer(zone)
|
||||||
wt.AssertNoErr(t, err)
|
wt.AssertNoErr(t, err)
|
||||||
err = mdnsServer.Start(nil)
|
err = mdnsServer.Start(nil, DEFAULT_LOCAL_DOMAIN)
|
||||||
wt.AssertNoErr(t, err)
|
wt.AssertNoErr(t, err)
|
||||||
|
|
||||||
var receivedAddr net.IP
|
var receivedAddr net.IP
|
||||||
|
|||||||
+74
-30
@@ -9,8 +9,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
LOCAL_DOMAIN = "weave.local."
|
DEFAULT_LOCAL_DOMAIN = "weave.local." // The default name used for the local domain
|
||||||
UDPBufSize = 4096 // bigger than the default 512
|
DEFAULT_SERVER_PORT = 53 // The default server port
|
||||||
|
DEFAULT_CLI_CFG_FILE = "/etc/resolv.conf" // default "resolv.conf" file to try to load
|
||||||
|
UDPBufSize = 4096 // bigger than the default 512
|
||||||
)
|
)
|
||||||
|
|
||||||
func makeDNSFailResponse(r *dns.Msg) *dns.Msg {
|
func makeDNSFailResponse(r *dns.Msg) *dns.Msg {
|
||||||
@@ -21,46 +23,87 @@ func makeDNSFailResponse(r *dns.Msg) *dns.Msg {
|
|||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
|
||||||
type DNSServer struct {
|
type DNSServerConfig struct {
|
||||||
config *dns.ClientConfig
|
// (Optional) client config file for resolving upstream servers
|
||||||
zone Zone
|
UpstreamCfgFIle string
|
||||||
iface *net.Interface
|
// (Optional) DNS client config for the fallback server(s)
|
||||||
port int
|
UpstreamCfg *dns.ClientConfig
|
||||||
udpSrv *dns.Server
|
// DNS zone served
|
||||||
tcpSrv *dns.Server
|
Zone Zone
|
||||||
|
// Interface where serving
|
||||||
|
Iface *net.Interface
|
||||||
|
// (Optional) port number (for TCP and UDP)
|
||||||
|
Port int
|
||||||
|
// (Optional) local domain (ie, "weave.local.")
|
||||||
|
LocalDomain string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates a new DNS server with a given config
|
type DNSServer struct {
|
||||||
func NewDNSServer(config *dns.ClientConfig, zone Zone, iface *net.Interface, port int) *DNSServer {
|
config *DNSServerConfig
|
||||||
return &DNSServer{
|
udpSrv *dns.Server
|
||||||
config: config,
|
tcpSrv *dns.Server
|
||||||
zone: zone,
|
mdnsCli *MDNSClient
|
||||||
iface: iface,
|
mdnsSrv *MDNSServer
|
||||||
port: port,
|
|
||||||
|
IfaceName string // the interface where mDNS is working on
|
||||||
|
ListenAddr string // the address the server is listening at
|
||||||
|
}
|
||||||
|
|
||||||
|
// Creates a new DNS server
|
||||||
|
func NewDNSServer(config DNSServerConfig) (s *DNSServer, err error) {
|
||||||
|
// fill empty parameters with defaults...
|
||||||
|
if config.Port == 0 {
|
||||||
|
config.Port = DEFAULT_SERVER_PORT
|
||||||
}
|
}
|
||||||
|
if len(config.LocalDomain) == 0 {
|
||||||
|
config.LocalDomain = DEFAULT_LOCAL_DOMAIN
|
||||||
|
}
|
||||||
|
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 {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mdnsClient, err := NewMDNSClient()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
mdnsServer, err := NewMDNSServer(config.Zone)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ifaceName := "default interface"
|
||||||
|
if config.Iface != nil {
|
||||||
|
ifaceName = config.Iface.Name
|
||||||
|
}
|
||||||
|
|
||||||
|
return &DNSServer{
|
||||||
|
config: &config,
|
||||||
|
mdnsCli: mdnsClient,
|
||||||
|
mdnsSrv: mdnsServer,
|
||||||
|
IfaceName: ifaceName,
|
||||||
|
ListenAddr: fmt.Sprintf(":%d", config.Port),
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start the DNS server
|
// Start the DNS server
|
||||||
func (s *DNSServer) Start() error {
|
func (s *DNSServer) Start() error {
|
||||||
Info.Printf("WeaveDNS server starting...")
|
Info.Printf("Using mDNS on %s", s.IfaceName)
|
||||||
|
err := s.mdnsCli.Start(s.config.Iface)
|
||||||
mdnsClient, err := NewMDNSClient()
|
|
||||||
CheckFatal(err)
|
CheckFatal(err)
|
||||||
|
err = s.mdnsSrv.Start(s.config.Iface, s.config.LocalDomain)
|
||||||
ifaceName := "default interface"
|
|
||||||
if s.iface != nil {
|
|
||||||
ifaceName = s.iface.Name
|
|
||||||
}
|
|
||||||
Info.Printf("Using mDNS on %s", ifaceName)
|
|
||||||
err = mdnsClient.Start(s.iface)
|
|
||||||
CheckFatal(err)
|
CheckFatal(err)
|
||||||
|
|
||||||
// create two DNS request multiplexerers, depending on the protocol used by clients
|
// create two DNS request multiplexerers, depending on the protocol used by clients
|
||||||
// (we use the same protocol for asking upstream servers)
|
// (we use the same protocol for asking upstream servers)
|
||||||
mux := func(client *dns.Client) *dns.ServeMux {
|
mux := func(client *dns.Client) *dns.ServeMux {
|
||||||
m := dns.NewServeMux()
|
m := dns.NewServeMux()
|
||||||
m.HandleFunc(LOCAL_DOMAIN, s.queryHandler([]Lookup{s.zone, mdnsClient}))
|
m.HandleFunc(s.config.LocalDomain, s.queryHandler([]Lookup{s.config.Zone, s.mdnsCli}))
|
||||||
m.HandleFunc(RDNS_DOMAIN, s.rdnsHandler([]Lookup{s.zone, mdnsClient}, client))
|
m.HandleFunc(RDNS_DOMAIN, s.rdnsHandler([]Lookup{s.config.Zone, s.mdnsCli}, client))
|
||||||
m.HandleFunc(".", s.notUsHandler(client))
|
m.HandleFunc(".", s.notUsHandler(client))
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
@@ -111,6 +154,7 @@ func (s *DNSServer) Stop() error {
|
|||||||
if err := s.udpSrv.Shutdown(); err != nil {
|
if err := s.udpSrv.Shutdown(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
// TODO: shutdown the mDNS client/server
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,8 +204,8 @@ func (s *DNSServer) notUsHandler(dnsClient *dns.Client) dns.HandlerFunc {
|
|||||||
return func(w dns.ResponseWriter, r *dns.Msg) {
|
return func(w dns.ResponseWriter, r *dns.Msg) {
|
||||||
q := r.Question[0]
|
q := r.Question[0]
|
||||||
Debug.Printf("[dns msgid %d] Fallback query: %+v", r.MsgHdr.Id, q)
|
Debug.Printf("[dns msgid %d] Fallback query: %+v", r.MsgHdr.Id, q)
|
||||||
for _, server := range s.config.Servers {
|
for _, server := range s.config.UpstreamCfg.Servers {
|
||||||
reply, _, err := dnsClient.Exchange(r, fmt.Sprintf("%s:%s", server, s.config.Port))
|
reply, _, err := dnsClient.Exchange(r, fmt.Sprintf("%s:%s", server, s.config.UpstreamCfg.Port))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Debug.Printf("[dns msgid %d] Network error trying %s (%s)",
|
Debug.Printf("[dns msgid %d] Network error trying %s (%s)",
|
||||||
r.MsgHdr.Id, server, err)
|
r.MsgHdr.Id, server, err)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ func TestUDPDNSServer(t *testing.T) {
|
|||||||
nonLocalName = "weave.works."
|
nonLocalName = "weave.works."
|
||||||
testAddr1 = "10.0.2.1"
|
testAddr1 = "10.0.2.1"
|
||||||
)
|
)
|
||||||
dnsAddr := fmt.Sprintf("localhost:%d", port)
|
dnsAddr := fmt.Sprintf("127.0.0.1:%d", port)
|
||||||
testCIDR1 := testAddr1 + "/24"
|
testCIDR1 := testAddr1 + "/24"
|
||||||
|
|
||||||
InitDefaultLogging(true)
|
InitDefaultLogging(true)
|
||||||
@@ -66,7 +66,8 @@ func TestUDPDNSServer(t *testing.T) {
|
|||||||
wt.AssertNoErr(t, err)
|
wt.AssertNoErr(t, err)
|
||||||
|
|
||||||
config := &dns.ClientConfig{Servers: []string{"127.0.0.1"}, Port: fallbackPort}
|
config := &dns.ClientConfig{Servers: []string{"127.0.0.1"}, Port: fallbackPort}
|
||||||
srv := NewDNSServer(config, zone, nil, port)
|
srv, err := NewDNSServer(DNSServerConfig{UpstreamCfg: config, Zone: zone, Port: port})
|
||||||
|
wt.AssertNoErr(t, err)
|
||||||
defer srv.Stop()
|
defer srv.Stop()
|
||||||
go srv.Start()
|
go srv.Start()
|
||||||
time.Sleep(100 * time.Millisecond) // Allow sever goroutine to start
|
time.Sleep(100 * time.Millisecond) // Allow sever goroutine to start
|
||||||
@@ -189,7 +190,8 @@ func TestTCPDNSServer(t *testing.T) {
|
|||||||
|
|
||||||
t.Logf("Creating a WeaveDNS server instance, falling back to 127.0.0.1:%s", fallbackPort)
|
t.Logf("Creating a WeaveDNS server instance, falling back to 127.0.0.1:%s", fallbackPort)
|
||||||
config := &dns.ClientConfig{Servers: []string{"127.0.0.1"}, Port: fallbackPort}
|
config := &dns.ClientConfig{Servers: []string{"127.0.0.1"}, Port: fallbackPort}
|
||||||
srv := NewDNSServer(config, zone, nil, port)
|
srv, err := NewDNSServer(DNSServerConfig{UpstreamCfg: config, Zone: zone, Port: port})
|
||||||
|
wt.AssertNoErr(t, err)
|
||||||
defer srv.Stop()
|
defer srv.Stop()
|
||||||
go srv.Start()
|
go srv.Start()
|
||||||
time.Sleep(100 * time.Millisecond) // Allow sever goroutine to start
|
time.Sleep(100 * time.Millisecond) // Allow sever goroutine to start
|
||||||
|
|||||||
+17
-11
@@ -19,6 +19,7 @@ func main() {
|
|||||||
justVersion bool
|
justVersion bool
|
||||||
ifaceName string
|
ifaceName string
|
||||||
apiPath string
|
apiPath string
|
||||||
|
localDomain string
|
||||||
fallback string
|
fallback string
|
||||||
dnsPort int
|
dnsPort int
|
||||||
httpPort int
|
httpPort int
|
||||||
@@ -31,6 +32,7 @@ func main() {
|
|||||||
flag.BoolVar(&justVersion, "version", false, "print version and exit")
|
flag.BoolVar(&justVersion, "version", false, "print version and exit")
|
||||||
flag.StringVar(&ifaceName, "iface", "", "name of interface to use for multicast")
|
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(&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.IntVar(&wait, "wait", 0, "number of seconds to wait for interface to be created and come up")
|
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(&dnsPort, "dnsport", 53, "port to listen to DNS requests")
|
||||||
flag.IntVar(&httpPort, "httpport", 6785, "port to listen to HTTP requests")
|
flag.IntVar(&httpPort, "httpport", 6785, "port to listen to HTTP requests")
|
||||||
@@ -67,25 +69,29 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var config *dns.ClientConfig
|
srvConfig := weavedns.DNSServerConfig{
|
||||||
|
Zone: zone,
|
||||||
|
Iface: iface,
|
||||||
|
Port: dnsPort,
|
||||||
|
LocalDomain: localDomain,
|
||||||
|
}
|
||||||
|
|
||||||
if len(fallback) > 0 {
|
if len(fallback) > 0 {
|
||||||
fallbackHost, fallbackPort, err := net.SplitHostPort(fallback)
|
fallbackHost, fallbackPort, err := net.SplitHostPort(fallback)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Error.Fatal("Fould not parse fallback host and port", err)
|
Error.Fatal("Fould not parse fallback host and port", err)
|
||||||
}
|
}
|
||||||
config = &dns.ClientConfig{Servers: []string{fallbackHost}, Port: fallbackPort}
|
srvConfig.UpstreamCfg = &dns.ClientConfig{Servers: []string{fallbackHost}, Port: fallbackPort}
|
||||||
Debug.Printf("DNS fallback at %s:%s", fallbackHost, fallbackPort)
|
Debug.Printf("DNS fallback at %s:%s", fallbackHost, fallbackPort)
|
||||||
} else {
|
|
||||||
config, err = dns.ClientConfigFromFile("/etc/resolv.conf")
|
|
||||||
if err != nil {
|
|
||||||
Error.Fatal("Failed obtain DNS client configuration", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
go weavedns.ListenHttp(weavedns.LOCAL_DOMAIN, zone, httpPort)
|
go weavedns.ListenHttp(localDomain, zone, httpPort)
|
||||||
srv := weavedns.NewDNSServer(config, zone, iface, dnsPort)
|
srv, err := weavedns.NewDNSServer(srvConfig)
|
||||||
|
if err != nil {
|
||||||
|
Error.Fatal("Failed to initialize the WeaveDNS server", err)
|
||||||
|
}
|
||||||
err = srv.Start()
|
err = srv.Start()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Error.Fatal("Failed to start server", err)
|
Error.Fatal("Failed to start the WeaveDNS server", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user