gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug squashin

Browse source
This commit is contained in:
worker-9 2021-08-05 21:26:10 -04:00
parent 31fbf85175
commit 2ad7c20283
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
netclient/functions/checkin.go
View file

@ -151,8 +151,8 @@ func CheckConfig(cliconf config.ClientConfig) error {
* Perform action if necessary
*/
func Pull(network string, manual bool) (*models.Node, error) {
node := config.GetNode(network)
cfg, err := config.ReadConfig(network)
node := cfg.Node
if err != nil {
return nil, err
}
@ -234,8 +234,8 @@ func Pull(network string, manual bool) (*models.Node, error) {
}
func Push(network string) error {
postnode := config.GetNode(network)
cfg, err := config.ReadConfig(network)
postnode := cfg.Node
if err != nil {
return err
}

9
netclient/wireguard/kernel.go
View file

@ -295,7 +295,7 @@ func SetWGKeyConfig(network string, serveraddr string) error {
return err
}
node := config.GetNode(network)
node := cfg.Node
privatekey, err := wgtypes.GeneratePrivateKey()
if err != nil {
@ -334,9 +334,8 @@ func SetWGConfig(network string, peerupdate bool) error {
}
servercfg := cfg.Server
nodecfg := cfg.Node
node := config.GetNode(network)
peers, hasGateway, gateways, err := server.GetPeers(node.MacAddress, nodecfg.Network, servercfg.GRPCAddress, node.IsDualStack == "yes", node.IsIngressGateway == "yes")
peers, hasGateway, gateways, err := server.GetPeers(nodecfg.MacAddress, nodecfg.Network, servercfg.GRPCAddress, nodecfg.IsDualStack == "yes", nodecfg.IsIngressGateway == "yes")
if err != nil {
return err
}
@ -345,9 +344,9 @@ func SetWGConfig(network string, peerupdate bool) error {
return err
}
if peerupdate {
SetPeers(node.Interface, node.PersistentKeepalive, peers)
SetPeers(nodecfg.Interface, nodecfg.PersistentKeepalive, peers)
} else {
err = InitWireguard(&node, privkey, peers, hasGateway, gateways)
err = InitWireguard(&nodecfg, privkey, peers, hasGateway, gateways)
}
if err != nil {
return err