From 3c429d5d28906bcc30fc23e30e4a6f816c7a9ac4 Mon Sep 17 00:00:00 2001
From: George <zhoreeq@users.noreply.github.com>
Date: Sun, 8 Mar 2020 06:01:02 -0400
Subject: [PATCH] Run daemon without config

---
 cmd/meshnamed/main.go | 57 ++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/cmd/meshnamed/main.go b/cmd/meshnamed/main.go
index 9c7edbe..ef620f8 100644
--- a/cmd/meshnamed/main.go
+++ b/cmd/meshnamed/main.go
@@ -32,41 +32,38 @@ func main() {
 		logger.EnableLevel("debug")
 	}
 
-	switch {
-	case *genconf != "":
+	if *genconf != "" {
 		confString, err := meshname.GenConf(*genconf, *subdomain)
 		if err != nil {
 			logger.Errorln(err)
 		} else {
 			fmt.Println(confString)
 		}
-	case *useconffile != "":
-		s := new(meshname.MeshnameServer)
-
-		_, validSubnet, err := net.ParseCIDR(*meshSubnetStr)
-		if err != nil {
-			logger.Errorln(err)
-			os.Exit(1)
-		}
-
-		s.Init(logger, *listenAddr, *useconffile, validSubnet)
-		s.Start()
-
-		c := make(chan os.Signal, 1)
-		r := make(chan os.Signal, 1)
-		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-		signal.Notify(r, os.Interrupt, syscall.SIGHUP)
-		defer s.Stop()
-		for {
-			select {
-			case _ = <-c:
-				goto exit
-			case _ = <-r:
-				s.UpdateConfig()
-			}
-		}
-	default:
-		flag.PrintDefaults()
+		return
+	}
+
+	s := new(meshname.MeshnameServer)
+
+	_, validSubnet, err := net.ParseCIDR(*meshSubnetStr)
+	if err != nil {
+		logger.Errorln(err)
+		os.Exit(1)
+	}
+
+	s.Init(logger, *listenAddr, *useconffile, validSubnet)
+	s.Start()
+
+	c := make(chan os.Signal, 1)
+	r := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	signal.Notify(r, os.Interrupt, syscall.SIGHUP)
+	defer s.Stop()
+	for {
+		select {
+		case _ = <-c:
+			return
+		case _ = <-r:
+			s.UpdateConfig()
+		}
 	}
-exit:
 }