Allow updating AdminListen during runtime

cmd/yggdrasil/main.go

@@ -76,46 +76,7 @@ func generateConfig(isAutoconf bool) *nodeConfig {
 	return &cfg
 }
 
-// Generates a new configuration and returns it in HJSON format. This is used
+func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeConfig {
-// with -genconf.
-func doGenconf(isjson bool) string {
-	cfg := generateConfig(false)
-	var bs []byte
-	var err error
-	if isjson {
-		bs, err = json.MarshalIndent(cfg, "", "  ")
-	} else {
-		bs, err = hjson.Marshal(cfg)
-	}
-	if err != nil {
-		panic(err)
-	}
-	return string(bs)
-}
-
-// The main function is responsible for configuring and starting Yggdrasil.
-func main() {
-	// Configure the command line parameters.
-	genconf := flag.Bool("genconf", false, "print a new config to stdout")
-	useconf := flag.Bool("useconf", false, "read HJSON/JSON config from stdin")
-	useconffile := flag.String("useconffile", "", "read HJSON/JSON config from specified file path")
-	normaliseconf := flag.Bool("normaliseconf", false, "use in combination with either -useconf or -useconffile, outputs your configuration normalised")
-	confjson := flag.Bool("json", false, "print configuration from -genconf or -normaliseconf as JSON instead of HJSON")
-	autoconf := flag.Bool("autoconf", false, "automatic mode (dynamic IP, peer with IPv6 neighbors)")
-	version := flag.Bool("version", false, "prints the version of this build")
-	flag.Parse()
-
-	var cfg *nodeConfig
-	switch {
-	case *version:
-		fmt.Println("Build name:", yggdrasil.GetBuildName())
-		fmt.Println("Build version:", yggdrasil.GetBuildVersion())
-		os.Exit(0)
-	case *autoconf:
-		// Use an autoconf-generated config, this will give us random keys and
-		// port numbers, and will use an automatically selected TUN/TAP interface.
-		cfg = generateConfig(true)
-	case *useconffile != "" || *useconf:
 	// Use a configuration file. If -useconf, the configuration will be read
 	// from stdin. If -useconffile, the configuration will be read from the
 	// filesystem.
@@ -148,7 +109,7 @@ func main() {
 	// then parse the configuration we loaded above on top of it. The effect
 	// of this is that any configuration item that is missing from the provided
 	// configuration will use a sane default.
-		cfg = generateConfig(false)
+	cfg := generateConfig(false)
 	var dat map[string]interface{}
 	if err := hjson.Unmarshal(config, &dat); err != nil {
 		panic(err)
@@ -224,6 +185,53 @@ func main() {
 	if err = mapstructure.Decode(dat, &cfg); err != nil {
 		panic(err)
 	}
+
+	return cfg
+}
+
+// Generates a new configuration and returns it in HJSON format. This is used
+// with -genconf.
+func doGenconf(isjson bool) string {
+	cfg := generateConfig(false)
+	var bs []byte
+	var err error
+	if isjson {
+		bs, err = json.MarshalIndent(cfg, "", "  ")
+	} else {
+		bs, err = hjson.Marshal(cfg)
+	}
+	if err != nil {
+		panic(err)
+	}
+	return string(bs)
+}
+
+// The main function is responsible for configuring and starting Yggdrasil.
+func main() {
+	// Configure the command line parameters.
+	genconf := flag.Bool("genconf", false, "print a new config to stdout")
+	useconf := flag.Bool("useconf", false, "read HJSON/JSON config from stdin")
+	useconffile := flag.String("useconffile", "", "read HJSON/JSON config from specified file path")
+	normaliseconf := flag.Bool("normaliseconf", false, "use in combination with either -useconf or -useconffile, outputs your configuration normalised")
+	confjson := flag.Bool("json", false, "print configuration from -genconf or -normaliseconf as JSON instead of HJSON")
+	autoconf := flag.Bool("autoconf", false, "automatic mode (dynamic IP, peer with IPv6 neighbors)")
+	version := flag.Bool("version", false, "prints the version of this build")
+	flag.Parse()
+
+	var cfg *nodeConfig
+	var err error
+	switch {
+	case *version:
+		fmt.Println("Build name:", yggdrasil.GetBuildName())
+		fmt.Println("Build version:", yggdrasil.GetBuildVersion())
+		os.Exit(0)
+	case *autoconf:
+		// Use an autoconf-generated config, this will give us random keys and
+		// port numbers, and will use an automatically selected TUN/TAP interface.
+		cfg = generateConfig(true)
+	case *useconffile != "" || *useconf:
+		// Read the configuration from either stdin or from the filesystem
+		cfg = readConfig(useconf, useconffile, normaliseconf)
 		// If the -normaliseconf option was specified then remarshal the above
 		// configuration and print it back to stdout. This lets the user update
 		// their configuration file with newly mapped names (like above) or to
@@ -327,7 +335,12 @@ func main() {
 	for {
 		select {
 		case _ = <-r:
+			if *useconffile != "" {
+				cfg = readConfig(useconf, useconffile, normaliseconf)
 				n.core.UpdateConfig(cfg)
+			} else {
+				logger.Println("Reloading config at runtime is only possible with -useconffile")
+			}
 		case _ = <-c:
 			goto exit
 		}

src/yggdrasil/admin.go

@@ -61,7 +61,9 @@ func (a *admin) init(c *Core) {
 			case e := <-a.reconfigure:
 				a.core.configMutex.RLock()
 				if a.core.config.AdminListen != a.core.configOld.AdminListen {
-					a.core.log.Println("AdminListen has changed!")
+					a.listenaddr = a.core.config.AdminListen
+					a.close()
+					a.start()
 				}
 				a.core.configMutex.RUnlock()
 				e <- nil