Merge pull request #1143 from gravitl/bugfix_v0.14.2_ipcheck

fixing ip check

logic/server.go

@@ -95,7 +95,7 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
 		if node.IsLocal == "yes" && node.LocalAddress != "" {
 			node.Endpoint = node.LocalAddress
 		} else {
-			node.Endpoint, err = ncutils.GetPublicIP()
+			node.Endpoint, err = servercfg.GetPublicIP()
 		}
 		if err != nil || node.Endpoint == "" {
 			logger.Log(0, "Error setting server node Endpoint.")

mq/publishers.go

@@ -103,6 +103,7 @@ func sendPeers() {
 		if servercfg.ManageIPTables() != "off" {
 			serverctl.InitIPTables(false)
 		}
+		servercfg.SetHost()
 
 		force = true
 		peer_force_send = 0

serverctl/serverctl.go

@@ -84,27 +84,6 @@ func SyncServerNetwork(network string) error {
 			}
 		}
 	}
-
-	// remove networks locally that do not exist in database
-	/*
-		for _, localnet := range localnets {
-			if strings.Contains(localnet.Name, "nm-") {
-				var exists = ""
-				if serverNetworkSettings.DefaultInterface == localnet.Name {
-					exists = serverNetworkSettings.NetID
-				}
-				if exists == "" {
-					err := logic.DeleteNodeByID(serverNode, true)
-					if err != nil {
-						if err == nil {
-							err = errors.New("network delete failed for " + exists)
-						}
-						logger.Log(1, "error removing network", exists, "during sync", err.Error())
-					}
-				}
-			}
-		}
-	*/
 	return nil
 }