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

bug squashin

Browse Source
This commit is contained in:
worker-9
2021-08-05 20:53:47 -04:00
parent 68a3109cae
commit e94e67c7f3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netclient/functions/checkin.go
View File

@@ -98,11 +98,6 @@ func checkNodeActions(node *models.Node, network string, servercfg config.Server
log.Println("Unable to process reset keys request:", err) log.Println("Unable to process reset keys request:", err)
return "" return ""
} }
node.Action = models.NODE_NOOP
if err = config.ModConfig(node); err != nil {
return ""
}
Push(network)
return "" return ""
} }
if node.Action == models.NODE_DELETE { if node.Action == models.NODE_DELETE {
@@ -127,12 +122,10 @@ func checkNodeActions(node *models.Node, network string, servercfg config.Server
func CheckConfig(cliconf config.ClientConfig) error { func CheckConfig(cliconf config.ClientConfig) error {
network := cliconf.Network network := cliconf.Network
// node := server.GetNode(network)
cfg, err := config.ReadConfig(network) cfg, err := config.ReadConfig(network)
if err != nil { if err != nil {
return err return err
} }
// nodecfg := cfg.Node
servercfg := cfg.Server servercfg := cfg.Server
newNode, err := Pull(network, false) newNode, err := Pull(network, false)
@@ -231,6 +224,10 @@ func Pull(network string, manual bool) (*models.Node, error) {
if err != nil { if err != nil {
return &resNode, err return &resNode, err
} }
} else {
if err = wireguard.SetWGConfig(network, true); err != nil {
return nil, err
}
} }
setDNS(&resNode, servercfg, &cfg.Node) setDNS(&resNode, servercfg, &cfg.Node)

3
netclient/wireguard/kernel.go
View File

@@ -342,6 +342,9 @@ func SetWGKeyConfig(network string, serveraddr string) error {
if err != nil { if err != nil {
return err return err
} }
if node.Action == models.NODE_UPDATE_KEY {
node.Action = models.NODE_NOOP
}
err = config.ModConfig(&node) err = config.ModConfig(&node)
if err != nil { if err != nil {
return err return err