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

merging userspace work

Browse source
This commit is contained in:
afeiszli 2021-10-14 23:38:01 -04:00
parent 6a96785419
commit eaa7597a05
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
logic/wireguard.go
View file

@ -108,10 +108,16 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
if !ncutils.IsKernel() { if !ncutils.IsKernel() {
var newConf string var newConf string
Log("setting wg conf", 3)
Log("wg conf address: "+node.Address+"/32", 3)
Log("wg conf key : "+key.String(), 3)
Log("wg conf mtu : "+strconv.Itoa(int(node.MTU)), 3)
if node.UDPHolePunch != "yes" || node.IsServer == "yes" { if node.UDPHolePunch != "yes" || node.IsServer == "yes" {
newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), strconv.FormatInt(int64(node.ListenPort), 10), node.MTU, node.PersistentKeepalive, peers) newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), strconv.FormatInt(int64(node.ListenPort), 10), node.MTU, node.PersistentKeepalive, peers)
Log("wg conf port : "+strconv.FormatInt(int64(node.ListenPort), 10), 3)
} else { } else {
newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), "", node.MTU, node.PersistentKeepalive, peers) newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), "", node.MTU, node.PersistentKeepalive, peers)
Log("wg conf port : (no port set)", 3)
} }
confPath := ncutils.GetNetclientPathSpecific() + ifacename + ".conf" confPath := ncutils.GetNetclientPathSpecific() + ifacename + ".conf"
Log("writing wg conf file to: "+confPath, 1) Log("writing wg conf file to: "+confPath, 1)
@ -129,6 +135,7 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
time.Sleep(time.Second >> 2) time.Sleep(time.Second >> 2)
d, _ = wgclient.Device(deviceiface) d, _ = wgclient.Device(deviceiface)
} }
time.Sleep(time.Second >> 2)
err = applyWGQuickConf(confPath) err = applyWGQuickConf(confPath)
if err != nil { if err != nil {
Log("failed to create wireguard interface", 1) Log("failed to create wireguard interface", 1)

6
serverctl/serverctl.go
View file

@ -106,11 +106,7 @@ func HandleContainedClient() error {
for _, serverNet := range servernets { for _, serverNet := range servernets {
err = logic.ServerCheckin(servercfg.GetNodeID(), serverNet.NetID) err = logic.ServerCheckin(servercfg.GetNodeID(), serverNet.NetID)
if err != nil { if err != nil {
logic.Log("error occurred during server checkin, running a pull: "+err.Error(), 1) logic.Log("error occurred during server checkin: "+err.Error(), 1)
_, err = logic.ServerPull(servercfg.GetNodeID(), serverNet.NetID, true)
if err != nil {
logic.Log("error when pulling after checkin: "+err.Error(), 1)
}
} }
} }
logic.Log("completed a checkin call", 3) logic.Log("completed a checkin call", 3)