From 8ea0574be92979ff8f7b7ba632e8bebba18386dc Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Sun, 6 Feb 2022 11:06:04 -0500
Subject: [PATCH] added cidr regardless

---
 netclient/functions/daemon.go     |  4 +++-
 netclient/functions/join.go       |  1 +
 netclient/local/routes_windows.go | 12 ++++++------
 netclient/wireguard/common.go     | 15 ++++++---------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go
index 2a59c0dc..7bc8c6f0 100644
--- a/netclient/functions/daemon.go
+++ b/netclient/functions/daemon.go
@@ -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
diff --git a/netclient/functions/join.go b/netclient/functions/join.go
index 2224f3f3..535667eb 100644
--- a/netclient/functions/join.go
+++ b/netclient/functions/join.go
@@ -244,6 +244,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
 			}
 		}
 	}
+
 	if cfg.Daemon != "off" {
 		err = daemon.InstallDaemon(cfg)
 	}
diff --git a/netclient/local/routes_windows.go b/netclient/local/routes_windows.go
index 3b3754b5..9c635ad6 100644
--- a/netclient/local/routes_windows.go
+++ b/netclient/local/routes_windows.go
@@ -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)
 }
diff --git a/netclient/wireguard/common.go b/netclient/wireguard/common.go
index f9255ba5..4defd201 100644
--- a/netclient/wireguard/common.go
+++ b/netclient/wireguard/common.go
@@ -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
 }