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

refactored delete, pull nil pointer and logging

Browse Source
This commit is contained in:
0xdcarns
2022-02-08 10:43:46 -05:00
parent a85a888251
commit 39cea2da6c
8 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netclient/wireguard/common.go
View File

@@ -165,10 +165,11 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
// ensure you clear any existing interface first
d, _ := wgclient.Device(deviceiface)
for d != nil && d.Name == deviceiface {
err = RemoveConf(deviceiface, false) // remove interface first
if strings.Contains(err.Error(), "does not exist") {
err = nil
break
if err = RemoveConf(deviceiface, false); err != nil { // remove interface first
if strings.Contains(err.Error(), "does not exist") {
err = nil
break
}
}
time.Sleep(time.Second >> 2)
d, _ = wgclient.Device(deviceiface)
@@ -201,7 +202,7 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
return fmt.Errorf("could not reliably create interface, please check wg installation and retry")
}
}
ncutils.PrintLog("interface ready - netclient engage", 1)
ncutils.PrintLog("interface ready - netclient.. ENGAGE", 1)
if syncconf { // should never be called really.
err = SyncWGQuickConf(ifacename, confPath)
}