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

Merge branch 'develop' of https://github.com/gravitl/netmaker into bugfixes_v0.10.0_various2

Browse Source
This commit is contained in:
afeiszli
2022-02-05 14:41:20 -05:00
parent d3a4b5ad8e 3b8c664a2d
commit 5d9e16f0a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netclient/wireguard/common.go
View File

@@ -177,12 +177,12 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
ncutils.PrintLog("waiting for interface...", 1) // ensure interface is created ncutils.PrintLog("waiting for interface...", 1) // ensure interface is created
output, _ := ncutils.RunCmd("wg", false) output, _ := ncutils.RunCmd("wg", false)
starttime := time.Now() starttime := time.Now()
ifaceReady := !strings.Contains(output, ifacename) ifaceReady := strings.Contains(output, ifacename)
for !ifaceReady && !(time.Now().After(starttime.Add(time.Second << 4))) { for !ifaceReady && !(time.Now().After(starttime.Add(time.Second << 4))) {
output, _ = ncutils.RunCmd("wg", false) output, _ = ncutils.RunCmd("wg", false)
err = ApplyConf(node, ifacename, confPath) err = ApplyConf(node, ifacename, confPath)
time.Sleep(time.Second) time.Sleep(time.Second)
ifaceReady = !strings.Contains(output, ifacename) ifaceReady = strings.Contains(output, ifacename)
} }
newDevice, devErr := wgclient.Device(deviceiface) newDevice, devErr := wgclient.Device(deviceiface)
if !ifaceReady || devErr != nil { if !ifaceReady || devErr != nil {