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

refactor + bugs

Browse Source
This commit is contained in:
0xdcarns
2022-04-25 19:33:31 -04:00
parent a6ee8101e6
commit cfb0904bd6
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netclient/functions/join.go
View File

@@ -144,6 +144,9 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
return fmt.Errorf("error decoding node from server %w %s", err, string(bodybytes)) return fmt.Errorf("error decoding node from server %w %s", err, string(bodybytes))
} }
node := nodeGET.Node node := nodeGET.Node
if nodeGET.Peers == nil {
nodeGET.Peers = []wgtypes.PeerConfig{}
}
// safety check. If returned node from server is local, but not currently configured as local, set to local addr // safety check. If returned node from server is local, but not currently configured as local, set to local addr
if cfg.Node.IsLocal != "yes" && node.IsLocal == "yes" && node.LocalRange != "" { if cfg.Node.IsLocal != "yes" && node.IsLocal == "yes" && node.LocalRange != "" {
node.LocalAddress, err = ncutils.GetLocalIP(node.LocalRange) node.LocalAddress, err = ncutils.GetLocalIP(node.LocalRange)

5
netclient/functions/pull.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/gravitl/netmaker/netclient/local" "github.com/gravitl/netmaker/netclient/local"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/wireguard" "github.com/gravitl/netmaker/netclient/wireguard"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
//homedir "github.com/mitchellh/go-homedir" //homedir "github.com/mitchellh/go-homedir"
) )
@@ -53,6 +54,10 @@ func Pull(network string, iface bool) (*models.Node, error) {
resNode := nodeGET.Node resNode := nodeGET.Node
// ensure that the OS never changes // ensure that the OS never changes
resNode.OS = runtime.GOOS resNode.OS = runtime.GOOS
if nodeGET.Peers == nil {
nodeGET.Peers = []wgtypes.PeerConfig{}
}
if iface { if iface {
if err = config.ModConfig(&resNode); err != nil { if err = config.ModConfig(&resNode); err != nil {
return nil, err return nil, err