Merge branch 'NET-10' of https://github.com/gravitl/netmaker into NET-164

auth/host_session.go

@@ -238,7 +238,7 @@ func CheckNetRegAndHostUpdate(networks []string, h *models.Host) {
 				Node:   *newNode,
 			})
 			if servercfg.IsMessageQueueBackend() {
-				mq.BroadCastAddOrUpdatePeer(h, newNode, false)
+				mq.BroadcastAddOrUpdatePeer(h, newNode, false)
 			}
 		}
 	}

controllers/hosts.go

@@ -303,7 +303,7 @@ func addHostToNetwork(w http.ResponseWriter, r *http.Request) {
 			Action: models.RequestAck,
 			Host:   *currHost,
 		})
-		go mq.BroadCastAddOrUpdatePeer(currHost, newNode, false)
+		go mq.BroadcastAddOrUpdatePeer(currHost, newNode, false)
 	}
 
 	logger.Log(2, r.Header.Get("user"), fmt.Sprintf("added host %s to network %s", currHost.Name, network))
@@ -355,7 +355,7 @@ func deleteHostFromNetwork(w http.ResponseWriter, r *http.Request) {
 
 	runUpdates(node, false)
 	go func() { // notify of peer change
-		go mq.BroadCastDelPeer(currHost, network)
+		go mq.BroadcastDelPeer(currHost, network)
 		if err := mq.PublishDNSDelete(node, currHost); err != nil {
 			logger.Log(1, "error publishing dns update", err.Error())
 		}

controllers/network.go

@@ -144,7 +144,7 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) {
 
 	// send peer updates
 	if servercfg.IsMessageQueueBackend() {
-		go mq.BroadCastAclUpdate(netname)
+		go mq.BroadcastAclUpdate(netname)
 
 	}
 	w.WriteHeader(http.StatusOK)

controllers/node.go

@@ -694,7 +694,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(apiNode)
 	runUpdates(newNode, ifaceDelta)
 	go func(aclUpdate bool, newNode *models.Node) {
-		mq.BroadCastAddOrUpdatePeer(host, newNode, true)
+		mq.BroadcastAddOrUpdatePeer(host, newNode, true)
 		if err := mq.PublishReplaceDNS(&currentNode, newNode, host); err != nil {
 			logger.Log(1, "failed to publish dns update", err.Error())
 		}
@@ -754,7 +754,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
 			logger.Log(1, "failed to retrieve host for node", node.ID.String(), err.Error())
 		}
 
-		err = mq.BroadCastDelPeer(host, deletedNode.Network)
+		err = mq.BroadcastDelPeer(host, deletedNode.Network)
 		if err != nil {
 			logger.Log(1, "error publishing peer update ", err.Error())
 		}

logic/peers.go

@@ -428,10 +428,8 @@ func GetPeerUpdateForHost(ctx context.Context, network string, host *models.Host
 // GetPeerListenPort - given a host, retrieve it's appropriate listening port
 func GetPeerListenPort(host *models.Host) int {
 	peerPort := host.ListenPort
-	if host.ProxyEnabled {
-		if host.ProxyListenPort != 0 {
-			peerPort = host.ProxyListenPort
-		}
+	if host.ProxyEnabled && host.ProxyListenPort != 0 {
+		peerPort = host.ProxyListenPort
 	}
 	if host.PublicListenPort != 0 {
 		peerPort = host.PublicListenPort

mq/handlers.go

@@ -63,7 +63,7 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
 		if err != nil {
 			return
 		}
-		if err = BroadCastAddOrUpdatePeer(h, &newNode, true); err != nil {
+		if err = BroadcastAddOrUpdatePeer(h, &newNode, true); err != nil {
 			logger.Log(0, "error updating peers when node", currentNode.ID.String(), "informed the server of an interface change", err.Error())
 		}
 		if nodes, err := logic.GetNetworkNodes(newNode.Network); err == nil {

mq/publishers.go

@@ -178,8 +178,8 @@ func FlushNetworkPeersToHost(host *models.Host, hNode *models.Node, networkNodes
 	return nil
 }
 
-// BroadCastDelPeer - notifys all the hosts in the network to remove peer
-func BroadCastDelPeer(host *models.Host, network string) error {
+// BroadcastDelPeer - notifys all the hosts in the network to remove peer
+func BroadcastDelPeer(host *models.Host, network string) error {
 	nodes, err := logic.GetNetworkNodes(network)
 	if err != nil {
 		return err
@@ -210,8 +210,8 @@ func BroadCastDelPeer(host *models.Host, network string) error {
 	return nil
 }
 
-// BroadCastAclUpdate - sends new acl updates to peers
-func BroadCastAclUpdate(network string) error {
+// BroadcastAclUpdate - sends new acl updates to peers
+func BroadcastAclUpdate(network string) error {
 	nodes, err := logic.GetNetworkNodes(network)
 	if err != nil {
 		return err
@@ -226,8 +226,8 @@ func BroadCastAclUpdate(network string) error {
 	return err
 }
 
-// BroadCastAddOrUpdatePeer - notifys the hosts in the network to add or update peer.
-func BroadCastAddOrUpdatePeer(host *models.Host, node *models.Node, update bool) error {
+// BroadcastAddOrUpdatePeer - notifys the hosts in the network to add or update peer.
+func BroadcastAddOrUpdatePeer(host *models.Host, node *models.Node, update bool) error {
 	nodes, err := logic.GetNetworkNodes(node.Network)
 	if err != nil {
 		return err