moving port check logic

netclient/functions/join.go

@@ -9,6 +9,7 @@ import (
 	"log"
 	"net/http"
 	"runtime"
+	"strconv"
 
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
@@ -171,11 +172,18 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
 	}
 	logger.Log(1, "node created on remote server...updating configs")
 	err = ncutils.ModPort(&node)
+<<<<<<< HEAD
 	if err != nil {
 		return err
 	}
 	informPortChange(&node)
 
+=======
+	logger.Log(0, "using port", strconv.Itoa(int(node.ListenPort)))
+	if err != nil {
+		return err
+	}
+>>>>>>> b1b376b0 (moving port check logic)
 	err = config.ModNodeConfig(&node)
 	if err != nil {
 		return err

netclient/functions/mqhandlers.go

@@ -106,6 +106,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 	file := ncutils.GetNetclientPathSpecific() + nodeCfg.Node.Interface + ".conf"
 
 	if ifaceDelta { // if a change caused an ifacedelta we need to notify the server to update the peers
+<<<<<<< HEAD
 		if newNode.ListenPort != nodeCfg.Node.LocalListenPort {
 			if err := wireguard.RemoveConf(newNode.Interface, false); err != nil {
 				logger.Log(0, "error remove interface", newNode.Interface, err.Error())
@@ -124,6 +125,13 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 		if keepaliveChange {
 			wireguard.UpdateKeepAlive(file, newNode.PersistentKeepalive)
 		}
+=======
+		err = ncutils.ModPort(&nodeCfg.Node)
+		if err != nil {
+			logger.Log(0, "error modifying node port on", nodeCfg.Node.Name, "-", err.Error())
+			return
+		}
+>>>>>>> b1b376b0 (moving port check logic)
 		logger.Log(0, "applying WG conf to "+file)
 		if ncutils.IsWindows() {
 			wireguard.RemoveConfGraceful(nodeCfg.Node.Interface)

netclient/functions/pull.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"runtime"
+	"strconv"
 
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/models"
@@ -62,6 +63,7 @@ func Pull(network string, iface bool) (*models.Node, error) {
 			logger.Log(0, "unable to update server config: "+err.Error())
 		}
 	}
+<<<<<<< HEAD
 	if nodeGET.Node.ListenPort != cfg.Node.LocalListenPort {
 		if err := wireguard.RemoveConf(resNode.Interface, false); err != nil {
 			logger.Log(0, "error remove interface", resNode.Interface, err.Error())
@@ -71,6 +73,12 @@ func Pull(network string, iface bool) (*models.Node, error) {
 			return nil, err
 		}
 		informPortChange(&resNode)
+=======
+	err = ncutils.ModPort(&resNode)
+	logger.Log(0, "port is now", strconv.Itoa(int(resNode.ListenPort)))
+	if err != nil {
+		return nil, err
+>>>>>>> b1b376b0 (moving port check logic)
 	}
 	if err = config.ModNodeConfig(&resNode); err != nil {
 		return nil, err