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

added cidr regardless

Browse Source
This commit is contained in:
0xdcarns
2022-02-06 11:06:04 -05:00
parent 36a8df5b7c
commit 8ea0574be9
4 changed files with 16 additions and 16 deletions
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 // ServerKeepAlive -- handler to react to keepalive messages published by server
func ServerKeepAlive(client mqtt.Client, msg mqtt.Message) { 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 // 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" { if cfg.Daemon != "off" {
err = daemon.InstallDaemon(cfg) 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 { func setRoute(iface string, addr *net.IPNet, address string) error {
var err 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) 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 return err
} }
func deleteRoute(iface string, addr *net.IPNet, address string) error { func deleteRoute(iface string, addr *net.IPNet, address string) error {
var err 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 return err
} }
func setCidr(iface, address string, addr *net.IPNet) { 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) 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) { 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) err = SyncWGQuickConf(ifacename, confPath)
} }
currentPeers := newDevice.Peers currentPeers := newDevice.Peers
if len(currentPeers) == 0 { // if no peers currently, apply cidr _, cidr, cidrErr := net.ParseCIDR(modcfg.NetworkSettings.AddressRange)
_, cidr, cidrErr := net.ParseCIDR(modcfg.NetworkSettings.AddressRange) if cidrErr == nil {
if cidrErr == nil { local.SetCIDRRoute(ifacename, node.Address, cidr)
local.SetCIDRRoute(ifacename, node.Address, cidr) } else {
} else { ncutils.PrintLog("could not set cidr route properly: "+cidrErr.Error(), 1)
ncutils.PrintLog("could not set cidr route properly: "+cidrErr.Error(), 1)
}
} else { // if peers, apply each
local.SetCurrentPeerRoutes(ifacename, node.Address, currentPeers[:])
} }
local.SetCurrentPeerRoutes(ifacename, node.Address, currentPeers[:])
return err return err
} }