From 9b1d8b1d895af1d833005dfb9b04f73032b35402 Mon Sep 17 00:00:00 2001
From: Abhishek Kondur <abhi281342@gmail.com>
Date: Tue, 10 Jan 2023 10:49:15 +0530
Subject: [PATCH] remove parameters from mq peer msg

---
 controllers/dns.go     | 2 +-
 controllers/hosts.go   | 4 ++--
 controllers/network.go | 2 +-
 controllers/node.go    | 4 ++--
 logic/peers.go         | 1 -
 mq/handlers.go         | 4 ++--
 mq/publishers.go       | 4 ++--
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/controllers/dns.go b/controllers/dns.go
index 0fee82b1..f143496d 100644
--- a/controllers/dns.go
+++ b/controllers/dns.go
@@ -176,7 +176,7 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
 	}
 	logger.Log(1, "new DNS record added:", entry.Name)
 	if servercfg.IsMessageQueueBackend() {
-		if err = mq.PublishPeerUpdate(entry.Network, false); err != nil {
+		if err = mq.PublishPeerUpdate(); err != nil {
 			logger.Log(0, "failed to publish peer update after ACL update on", entry.Network)
 		}
 	}
diff --git a/controllers/hosts.go b/controllers/hosts.go
index 12d8cbbb..d967bdd4 100644
--- a/controllers/hosts.go
+++ b/controllers/hosts.go
@@ -236,7 +236,7 @@ func createHostRelay(w http.ResponseWriter, r *http.Request) {
 	// 	logger.Log(1, "error sending update to relay host ", relayHost.ID.String(), ": ", err.Error())
 	// }
 	go func() {
-		if err := mq.PublishPeerUpdate("", false); err != nil {
+		if err := mq.PublishPeerUpdate(); err != nil {
 			logger.Log(0, "fail to publish peer update: ", err.Error())
 		}
 	}()
@@ -279,7 +279,7 @@ func deleteHostRelay(w http.ResponseWriter, r *http.Request) {
 	// 	logger.Log(1, "error sending update to relayed host ", relayHost.ID.String(), ": ", err.Error())
 	// }
 	go func() {
-		if err := mq.PublishPeerUpdate("", false); err != nil {
+		if err := mq.PublishPeerUpdate(); err != nil {
 			logger.Log(0, "fail to publish peer update: ", err.Error())
 		}
 	}()
diff --git a/controllers/network.go b/controllers/network.go
index ac11c0f4..6dbdd6ae 100644
--- a/controllers/network.go
+++ b/controllers/network.go
@@ -307,7 +307,7 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) {
 
 	// send peer updates
 	if servercfg.IsMessageQueueBackend() {
-		if err = mq.PublishPeerUpdate(netname, false); err != nil {
+		if err = mq.PublishPeerUpdate(); err != nil {
 			logger.Log(0, "failed to publish peer update after ACL update on", netname)
 		}
 	}
diff --git a/controllers/node.go b/controllers/node.go
index 8d4d11a5..f30e3ffa 100644
--- a/controllers/node.go
+++ b/controllers/node.go
@@ -662,7 +662,7 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(response)
 
 	go func() {
-		if err := mq.PublishPeerUpdate(data.Node.Network, true); err != nil {
+		if err := mq.PublishPeerUpdate(); err != nil {
 			logger.Log(1, "failed a peer update after creation of node", data.Host.Name)
 		}
 	}()
@@ -1078,7 +1078,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	go func(network string) {
-		if err := mq.PublishPeerUpdate(network, false); err != nil {
+		if err := mq.PublishPeerUpdate(); err != nil {
 			logger.Log(1, "error publishing peer update ", err.Error())
 		}
 	}(node.Network)
diff --git a/logic/peers.go b/logic/peers.go
index cff09461..23ca14a1 100644
--- a/logic/peers.go
+++ b/logic/peers.go
@@ -321,7 +321,6 @@ func GetProxyUpdateForHost(host *models.Host) (proxy_models.ProxyManagerPayload,
 
 	//proxyPayload.WgAddr = addr.String()
 	proxyPayload.PeerMap = peerConfMap
-	fmt.Printf("----------> PEERRR MAP: %+v\n", peerConfMap)
 	//proxyPayload.Network = node.Network
 	//proxyPayload.InterfaceName = node.Interface
 	//hardcode or read from host ??
diff --git a/mq/handlers.go b/mq/handlers.go
index 985bf3fd..3fa6ad47 100644
--- a/mq/handlers.go
+++ b/mq/handlers.go
@@ -116,7 +116,7 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
 			return
 		}
 		if ifaceDelta { // reduce number of unneeded updates, by only sending on iface changes
-			if err = PublishPeerUpdate(currentNode.Network, true); err != nil {
+			if err = PublishPeerUpdate(); err != nil {
 				logger.Log(0, "error updating peers when node", currentNode.ID.String(), "informed the server of an interface change", err.Error())
 			}
 		}
@@ -218,7 +218,7 @@ func ClientPeerUpdate(client mqtt.Client, msg mqtt.Message) {
 }
 
 func updateNodePeers(currentNode *models.Node) {
-	if err := PublishPeerUpdate(currentNode.Network, false); err != nil {
+	if err := PublishPeerUpdate(); err != nil {
 		logger.Log(1, "error publishing peer update ", err.Error())
 		return
 	}
diff --git a/mq/publishers.go b/mq/publishers.go
index ce530dad..bd7250ab 100644
--- a/mq/publishers.go
+++ b/mq/publishers.go
@@ -15,7 +15,7 @@ import (
 )
 
 // PublishPeerUpdate --- determines and publishes a peer update to all the hosts
-func PublishPeerUpdate(network string, publishToSelf bool) error {
+func PublishPeerUpdate() error {
 	if !servercfg.IsMessageQueueBackend() {
 		return nil
 	}
@@ -74,7 +74,7 @@ func PublishSingleHostUpdate(host *models.Host) error {
 // PublishPeerUpdate --- publishes a peer update to all the peers of a node
 func PublishExtPeerUpdate(node *models.Node) error {
 
-	go PublishPeerUpdate(node.Network, false)
+	go PublishPeerUpdate()
 	return nil
 }