From d10a0d6137811991d7c791a0a21f0eac7d36dd21 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 3 Jan 2019 22:50:08 +0000
Subject: [PATCH] Add GenerateConfigJSON, fix StartJSON

---
 src/yggdrasil/mobile.go | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/yggdrasil/mobile.go b/src/yggdrasil/mobile.go
index c4bc8de..f579f53 100644
--- a/src/yggdrasil/mobile.go
+++ b/src/yggdrasil/mobile.go
@@ -3,6 +3,7 @@
 package yggdrasil
 
 import (
+	"encoding/json"
 	"log"
 	"os"
 	"regexp"
@@ -23,7 +24,7 @@ func (c *Core) StartAutoconfigure() error {
 	logger := log.New(os.Stdout, "", 0)
 	nc := config.GenerateConfig(true)
 	nc.IfName = "dummy"
-	nc.AdminListen = "tcp://[::]:9001"
+	nc.AdminListen = "tcp://localhost:9001"
 	nc.Peers = []string{}
 	if hostname, err := os.Hostname(); err == nil {
 		nc.NodeInfo = map[string]interface{}{"name": hostname}
@@ -49,12 +50,29 @@ func (c *Core) StartJSON(configjson []byte) error {
 		return err
 	}
 	nc.IfName = "dummy"
+	for _, ll := range nc.MulticastInterfaces {
+		ifceExpr, err := regexp.Compile(ll)
+		if err != nil {
+			panic(err)
+		}
+		c.AddMulticastInterfaceExpr(ifceExpr)
+	}
 	if err := c.Start(nc, logger); err != nil {
 		return err
 	}
 	return nil
 }
 
+func GenerateConfigJSON() []byte {
+	nc := config.GenerateConfig(false)
+	nc.IfName = "dummy"
+	if json, err := json.Marshal(nc); err == nil {
+		return json
+	} else {
+		return nil
+	}
+}
+
 func (c *Core) GetAddressString() string {
 	return c.GetAddress().String()
 }