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

handler for KeyUpdate was missing a call to apply new wireguard conf

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-02-08 13:35:17 -05:00
committed by 0xdcarns
parent 4ffbbf128a
commit a4da05117e
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
netclient/functions/daemon.go
View File

@@ -275,6 +275,14 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
if !strings.Contains("rpc error", err.Error()) { if !strings.Contains("rpc error", err.Error()) {
ncutils.PrintLog(fmt.Sprintf("failed to leave, please check that local files for network %s were removed", cfg.Node.Network), 1) ncutils.PrintLog(fmt.Sprintf("failed to leave, please check that local files for network %s were removed", cfg.Node.Network), 1)
} }
ncutils.PrintLog(fmt.Sprintf("%s was removed", cfg.Node.Name), 1)
return
case models.NODE_UPDATE_KEY:
if err := UpdateKeys(&cfg, client); err != nil {
ncutils.PrintLog("err updating wireguard keys: "+err.Error(), 1)
}
case models.NODE_NOOP:
default:
} }
ncutils.PrintLog(fmt.Sprintf("%s was removed", cfg.Node.Name), 1) ncutils.PrintLog(fmt.Sprintf("%s was removed", cfg.Node.Name), 1)
return return
@@ -462,10 +470,14 @@ func UpdateKeys(cfg *config.ClientConfig, client mqtt.Client) error {
return err return err
} }
cfg.Node.PublicKey = key.PublicKey().String() cfg.Node.PublicKey = key.PublicKey().String()
PublishNodeUpdate(cfg)
if err := config.ModConfig(&cfg.Node); err != nil { if err := config.ModConfig(&cfg.Node); err != nil {
ncutils.Log("error updating local config " + err.Error()) ncutils.Log("error updating local config " + err.Error())
} }
PublishNodeUpdate(cfg)
if err = wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, file); err != nil {
ncutils.Log("error applying new config " + err.Error())
return err
}
return nil return nil
} }