zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-08 10:11:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change to single variable in ClientConfig (no nested GlobalSettings).

Browse Source
This commit is contained in:
cameronts
2022-07-28 12:50:53 -07:00
parent 1cb42e8f8b
commit 05283eff14
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netclient/functions/join.go
View File

@@ -85,7 +85,7 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
if cfg.Node.IsLocal == "yes" && cfg.Node.LocalAddress != "" {
cfg.Node.Endpoint = cfg.Node.LocalAddress
} else {
cfg.Node.Endpoint, err = ncutils.GetPublicIP(cfg.GlobalSettings.PublicIPService)
cfg.Node.Endpoint, err = ncutils.GetPublicIP(cfg.PublicIPService)
}
if err != nil || cfg.Node.Endpoint == "" {
logger.Log(0, "network:", cfg.Network, "error setting cfg.Node.Endpoint.")

2
netclient/functions/mqpublish.go
View File

@@ -44,7 +44,7 @@ func checkin() {
nodeCfg.Network = network
nodeCfg.ReadConfig()
if nodeCfg.Node.IsStatic != "yes" {
extIP, err := ncutils.GetPublicIP(nodeCfg.GlobalSettings.PublicIPService)
extIP, err := ncutils.GetPublicIP(nodeCfg.PublicIPService)
if err != nil {
logger.Log(1, "error encountered checking public ip addresses: ", err.Error())
}