refactor

cmd/meshnamed/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"net"
 	"os"
 	"strings"
 	"os/signal"
@@ -43,17 +42,11 @@ func main() {
 		return
 	}
 
-	networks := make(map[string]*net.IPNet)
+	networks := make(map[string]string)
 	for _, item := range strings.Split(*networksconf, ",") {
-		tokens := strings.SplitN(item, "=", 2)
+		if tokens := strings.SplitN(item, "=", 2); len(tokens) == 2 {
-		domain, subnet := tokens[0], tokens[1]
+			networks[tokens[0]] = tokens[1]
-
-		_, validSubnet, err := net.ParseCIDR(subnet)
-		if err != nil {
-			logger.Errorln(err)
-			os.Exit(1)
 		}
-		networks[domain] = validSubnet
 	}
 
 	s := new(meshname.MeshnameServer)

src/meshname/server.go

@@ -57,10 +57,18 @@ type MeshnameServer struct {
 	networks                   map[string]*net.IPNet
 }
 
-func (s *MeshnameServer) Init(log *log.Logger, listenAddr string, zoneConfigPath string, networks map[string]*net.IPNet) {
+func (s *MeshnameServer) Init(log *log.Logger, listenAddr string, zoneConfigPath string, networks map[string]string) {
 	s.log = log
 	s.listenAddr = listenAddr
-	s.networks = networks
+	s.networks = make(map[string]*net.IPNet)
+	for domain, subnet := range networks {
+		_, validSubnet, err := net.ParseCIDR(subnet)
+		if err != nil {
+			s.log.Errorln(err)
+			continue
+		}
+		s.networks[domain] = validSubnet
+	}
 	s.zoneConfigPath = zoneConfigPath
 	s.zoneConfig = make(map[string][]dns.RR)
 	if s.dnsClient == nil {