From 09c2f9bf8bbbcd5af3739fdd4db1054c1801db1e Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Mon, 31 Jan 2022 15:37:57 -0500
Subject: [PATCH] fixing peer locs

---
 netclient/functions/daemon.go | 8 ++++----
 netclient/wireguard/unix.go   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go
index 3bacd4b4..e3d72c4f 100644
--- a/netclient/functions/daemon.go
+++ b/netclient/functions/daemon.go
@@ -191,7 +191,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 				ncutils.PrintLog("error deleting local instance: "+err.Error(), 1)
 				return
 			}
-			if token := client.Unsubscribe("update/"+newNode.ID, "update/peers/"+newNode.ID); token.Wait() && token.Error() != nil {
+			if token := client.Unsubscribe(fmt.Sprintf("update/%s/%s", newNode.Network, newNode.ID), fmt.Sprintf("peers/%s/%s", newNode.Network, newNode.ID)); token.Wait() && token.Error() != nil {
 				ncutils.PrintLog("error unsubscribing during node deletion", 1)
 			}
 			return
@@ -253,7 +253,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 	}()
 }
 
-// UpdatePeers -- mqtt message handler for /update/peers/<NodeID> topic
+// UpdatePeers -- mqtt message handler for peers/<Network>/<NodeID> topic
 func UpdatePeers(client mqtt.Client, msg mqtt.Message) {
 	go func() {
 		var peerUpdate models.PeerUpdate
@@ -336,13 +336,13 @@ func Resubscribe(client mqtt.Client, cfg *config.ClientConfig) error {
 		ncutils.Log("resubbing on network " + cfg.Node.Network)
 		client.Disconnect(250)
 		client = SetupMQTT(cfg)
-		if token := client.Subscribe("update/"+cfg.Node.ID, 0, NodeUpdate); token.Wait() && token.Error() != nil {
+		if token := client.Subscribe(fmt.Sprintf("update/%s/%s", cfg.Node.Network, cfg.Node.ID), 0, NodeUpdate); token.Wait() && token.Error() != nil {
 			log.Fatal(token.Error())
 		}
 		if cfg.DebugOn {
 			ncutils.Log("subscribed to node updates for node " + cfg.Node.Name + " update/" + cfg.Node.ID)
 		}
-		if token := client.Subscribe("update/peers/"+cfg.Node.ID, 0, UpdatePeers); token.Wait() && token.Error() != nil {
+		if token := client.Subscribe(fmt.Sprintf("peers/%s/%s", cfg.Node.Network, cfg.Node.ID), 0, UpdatePeers); token.Wait() && token.Error() != nil {
 			log.Fatal(token.Error())
 		}
 		var id string
diff --git a/netclient/wireguard/unix.go b/netclient/wireguard/unix.go
index 7048c9f9..8a07f3c9 100644
--- a/netclient/wireguard/unix.go
+++ b/netclient/wireguard/unix.go
@@ -60,11 +60,11 @@ func ApplyWGQuickConf(confPath string) error {
 	}
 	_, err = ncutils.RunCmd("wg-quick down "+confPath, true)
 	if err != nil {
-		ncutils.Log("err runing wg-quick down " + confPath + err.Error())
+		ncutils.Log("err running wg-quick down " + confPath + ": " + err.Error())
 	}
 	_, err = ncutils.RunCmd("wg-quick up "+confPath, true)
 	if err != nil {
-		ncutils.Log("err runing wg-quick up " + confPath + err.Error())
+		ncutils.Log("err runinng wg-quick up " + confPath + ": " + err.Error())
 	}
 	return err
 }