Add an option to disable .meship resolver

cmd/meshnamed/main.go

@@ -38,7 +38,7 @@ func loadConfig(s *meshname.MeshnameServer, confPath string) error {
 
 var (
 	genconf, subdomain, useconffile, listenAddr, networksconf string
-	debug, allowRemote                                        bool
+	debug, noMeshIP, allowRemote                              bool
 )
 
 func init() {
@@ -47,6 +47,7 @@ func init() {
 	flag.StringVar(&useconffile, "useconffile", "", "run daemon with a config file")
 	flag.StringVar(&listenAddr, "listenaddr", "[::1]:53535", "address to listen on")
 	flag.StringVar(&networksconf, "networks", "ygg=200::/7,cjd=fc00::/8,meshname=::/0", "TLD=subnet list separated by comma")
+	flag.BoolVar(&noMeshIP, "nomeship", false, "disable .meship resolver")
 	flag.BoolVar(&allowRemote, "allowremote", false, "allow remote queries from any IP address")
 	flag.BoolVar(&debug, "debug", false, "enable debug logging")
 }
@@ -77,7 +78,7 @@ func main() {
 		logger.Fatalln(err)
 	}
 
-	s := meshname.New(logger, listenAddr, networks, allowRemote)
+	s := meshname.New(logger, listenAddr, networks, !noMeshIP, allowRemote)
 	if useconffile != "" {
 		if err := loadConfig(s, useconffile); err != nil {
 			logger.Fatalln(err)

pkg/meshname/server.go

@@ -11,12 +11,13 @@ import (
 )
 
 type MeshnameServer struct {
-	log        *log.Logger
+	log          *log.Logger
-	listenAddr string
+	listenAddr   string
-	dnsClient  *dns.Client
+	dnsClient    *dns.Client
-	dnsServer  *dns.Server
+	dnsServer    *dns.Server
-	networks   map[string]*net.IPNet
+	networks     map[string]*net.IPNet
-	allowRemote bool
+	enableMeshIP bool
+	allowRemote  bool
 
 	dnsRecordsLock sync.RWMutex
 	dnsRecords     map[string][]dns.RR
@@ -26,17 +27,18 @@ type MeshnameServer struct {
 }
 
 // New is a constructor for MeshnameServer
-func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, allowRemote bool) *MeshnameServer {
+func New(log *log.Logger, listenAddr string, networks map[string]*net.IPNet, enableMeshIP bool, allowRemote bool) *MeshnameServer {
 	dnsClient := new(dns.Client)
 	dnsClient.Timeout = 5000000000 // increased 5 seconds timeout
 
 	return &MeshnameServer{
-		log:        log,
+		log:          log,
-		listenAddr: listenAddr,
+		listenAddr:   listenAddr,
-		dnsRecords: make(map[string][]dns.RR),
+		dnsRecords:   make(map[string][]dns.RR),
-		networks:   networks,
+		networks:     networks,
-		dnsClient:  dnsClient,
+		dnsClient:    dnsClient,
-		allowRemote: allowRemote,
+		enableMeshIP: enableMeshIP,
+		allowRemote:  allowRemote,
 	}
 }
 
@@ -59,17 +61,20 @@ func (s *MeshnameServer) Start() error {
 	if !s.started {
 		waitStarted := make(chan struct{})
 		s.dnsServer = &dns.Server{
-			Addr: s.listenAddr,
+			Addr:              s.listenAddr,
-			Net: "udp",
+			Net:               "udp",
-			NotifyStartedFunc: func(){ close(waitStarted) },
+			NotifyStartedFunc: func() { close(waitStarted) },
 		}
 		for tld, subnet := range s.networks {
 			dns.HandleFunc(tld, s.handleMeshnameRequest)
 			s.log.Debugln("Handling:", tld, subnet)
 		}
-		dns.HandleFunc("meship", s.handleMeshIPRequest)
+		if s.enableMeshIP {
-		s.log.Debugln("Handling: meship ::/0")
+			dns.HandleFunc("meship", s.handleMeshIPRequest)
-		go func(){
+			s.log.Debugln("Handling: meship ::/0")
+		}
+
+		go func() {
 			if err := s.dnsServer.ListenAndServe(); err != nil {
 				s.log.Fatalln("MeshnameServer failed to start:", err)
 			}
@@ -159,9 +164,8 @@ func (s *MeshnameServer) handleMeshIPRequest(w dns.ResponseWriter, r *dns.Msg) {
 			s.log.Debugln("Error: invalid resource requested")
 			continue
 		}
-		subDomain := labels[len(labels)-2]
 
-		if resolvedAddr, err := IPFromDomain(&subDomain); err == nil {
+		if resolvedAddr, err := IPFromDomain(&labels[0]); err == nil {
 			answer := new(dns.AAAA)
 			answer.Hdr = dns.RR_Header{Name: q.Name, Rrtype: dns.TypeAAAA, Class: dns.ClassINET, Ttl: 3600}
 			answer.AAAA = resolvedAddr