Browse Source

Updated with PR review comments.

cameronts 3 years ago
parent
commit
3f0f2c88ca
2 changed files with 5 additions and 3 deletions
  1. 3 2
      netclient/functions/daemon.go
  2. 2 1
      netclient/global_settings/globalsettings.go

+ 3 - 2
netclient/functions/daemon.go

@@ -97,10 +97,11 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
 		if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, ncutils.GetNetclientPathSpecific()+cfg.Node.Interface+".conf"); err != nil {
 		if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, ncutils.GetNetclientPathSpecific()+cfg.Node.Interface+".conf"); err != nil {
 			logger.Log(0, "failed to start ", cfg.Node.Interface, "wg interface", err.Error())
 			logger.Log(0, "failed to start ", cfg.Node.Interface, "wg interface", err.Error())
 		}
 		}
-		server := cfg.Server.Server
 		if cfg.PublicIPService != "" {
 		if cfg.PublicIPService != "" {
-			global_settings.PublicIPServices[server] = cfg.PublicIPService
+			global_settings.PublicIPServices[network] = cfg.PublicIPService
 		}
 		}
+
+		server := cfg.Server.Server
 		if !serverSet[server] {
 		if !serverSet[server] {
 			// == subscribe to all nodes for each on machine ==
 			// == subscribe to all nodes for each on machine ==
 			serverSet[server] = true
 			serverSet[server] = true

+ 2 - 1
netclient/global_settings/globalsettings.go

@@ -2,4 +2,5 @@ package global_settings
 
 
 // globalsettings - settings that are global in nature.  Avoids circular dependencies between config loading and usage.
 // globalsettings - settings that are global in nature.  Avoids circular dependencies between config loading and usage.
 
 
-var PublicIPServices map[string]string
+// PublicIPServices - the list of user-specified IP services to use to obtain the node's public IP
+var PublicIPServices map[string]string = make(map[string]string)