gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-28 01:52:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #689 from gravitl/bugfix_v0.10.0_windowsroutes

Browse source 
added cidr regardless
This commit is contained in:
dcarns 2022-02-06 11:07:24 -05:00 committed by GitHub
commit 5824c39738
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
netclient/functions/daemon.go
View file

@ -388,7 +388,9 @@ func MonitorKeepalive(ctx context.Context, client mqtt.Client, cfg *config.Clien
// ServerKeepAlive -- handler to react to keepalive messages published by server
func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) {
keepalive.Store(parseNetworkFromTopic(msg.Topic()), time.Now())
var currentTime = time.Now()
keepalive.Store(parseNetworkFromTopic(msg.Topic()), currentTime)
ncutils.PrintLog("setting time: "+currentTime.String(), 1)
}
// Resubscribe --- handles resubscribing if needed

1
netclient/functions/join.go
View file

@ -244,6 +244,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
}
}
}
if cfg.Daemon != "off" {
err = daemon.InstallDaemon(cfg)
}

12
netclient/local/routes_windows.go
View file

@ -9,24 +9,24 @@ import (
func setRoute(iface string, addr *net.IPNet, address string) error {
var err error
_, err = ncutils.RunCmd("route -p add "+addr.IP.String()+" mask "+addr.Mask.String()+" "+address, false)
_, err = ncutils.RunCmd("route ADD "+addr.String()+" "+address, false)
time.Sleep(time.Second >> 2)
ncutils.RunCmd("route change "+addr.IP.String()+" mask "+addr.Mask.String()+" "+address, false)
ncutils.RunCmd("route CHANGE "+addr.IP.String()+" MASK "+addr.Mask.String()+" "+address, false)
return err
}
func deleteRoute(iface string, addr *net.IPNet, address string) error {
var err error
_, err = ncutils.RunCmd("route delete "+addr.IP.String()+" mask "+addr.Mask.String()+" "+address, false)
_, err = ncutils.RunCmd("route DELETE "+addr.IP.String()+" MASK "+addr.Mask.String()+" "+address, false)
return err
}
func setCidr(iface, address string, addr *net.IPNet) {
ncutils.RunCmd("route -p add "+addr.IP.String()+" mask "+addr.Mask.String()+" "+address, false)
ncutils.RunCmd("route ADD "+addr.String()+" "+address, false)
time.Sleep(time.Second >> 2)
ncutils.RunCmd("route change "+addr.IP.String()+" mask "+addr.Mask.String()+" "+address, false)
ncutils.RunCmd("route CHANGE "+addr.IP.String()+" MASK "+addr.Mask.String()+" "+address, false)
}
func removeCidr(iface string, addr *net.IPNet, address string) {
ncutils.RunCmd("route delete "+addr.IP.String()+" mask "+addr.Mask.String()+" "+address, false)
ncutils.RunCmd("route DELETE "+addr.String(), false)
}

15
netclient/wireguard/common.go
View file

@ -194,16 +194,13 @@ func InitWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
err = SyncWGQuickConf(ifacename, confPath)
}
currentPeers := newDevice.Peers
if len(currentPeers) == 0 { // if no peers currently, apply cidr
_, cidr, cidrErr := net.ParseCIDR(modcfg.NetworkSettings.AddressRange)
if cidrErr == nil {
local.SetCIDRRoute(ifacename, node.Address, cidr)
} else {
ncutils.PrintLog("could not set cidr route properly: "+cidrErr.Error(), 1)
}
} else { // if peers, apply each
local.SetCurrentPeerRoutes(ifacename, node.Address, currentPeers[:])
_, cidr, cidrErr := net.ParseCIDR(modcfg.NetworkSettings.AddressRange)
if cidrErr == nil {
local.SetCIDRRoute(ifacename, node.Address, cidr)
} else {
ncutils.PrintLog("could not set cidr route properly: "+cidrErr.Error(), 1)
}
local.SetCurrentPeerRoutes(ifacename, node.Address, currentPeers[:])
return err
}