changed to dissallow udp hole punch on server nodes

logic/server.go

@@ -26,11 +26,12 @@ func ServerJoin(network string, serverID string, privateKey string) error {
 	var err error
 	var node *models.Node // fill this object with server node specifics
 	node = &models.Node{
-		IsServer:   "yes",
-		DNSOn:      "no",
-		IsStatic:   "yes",
-		Name:       models.NODE_SERVER_NAME,
-		MacAddress: serverID,
+		IsServer:     "yes",
+		DNSOn:        "no",
+		IsStatic:     "yes",
+		Name:         models.NODE_SERVER_NAME,
+		MacAddress:   serverID,
+		UDPHolePunch: "no",
 	}
 	node.SetDefaults()
 
@@ -111,8 +112,6 @@ func ServerJoin(network string, serverID string, privateKey string) error {
 	node.SetID()
 	if err = StorePrivKey(node.ID, privateKey); err != nil {
 		return err
-	} else {
-		Log("stored private key "+privateKey, 0)
 	}
 	if err = ServerPush(node.MacAddress, node.Network); err != nil {
 		return err

logic/serverconf.go

@@ -2,7 +2,6 @@ package logic
 
 import (
 	"encoding/json"
-	"log"
 
 	"github.com/gravitl/netmaker/database"
 )
@@ -39,7 +38,6 @@ func FetchPrivKey(serverID string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	log.Println(fetchedData)
 	return fetchedData.PrivateKey, nil
 }
 

logic/wireguard.go

@@ -108,11 +108,7 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
 
 	if !ncutils.IsKernel() {
 		var newConf string
-		if node.UDPHolePunch != "yes" {
-			newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), strconv.FormatInt(int64(node.ListenPort), 10), node.MTU, node.PersistentKeepalive, peers)
-		} else {
-			newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), "", node.MTU, node.PersistentKeepalive, peers)
-		}
+		newConf, _ = ncutils.CreateUserSpaceConf(node.Address, key.String(), strconv.FormatInt(int64(node.ListenPort), 10), node.MTU, node.PersistentKeepalive, peers)
 		confPath := ncutils.GetNetclientPathSpecific() + ifacename + ".conf"
 		Log("writing wg conf file to: "+confPath, 1)
 		err = ioutil.WriteFile(confPath, []byte(newConf), 0644)

models/node.go

@@ -4,13 +4,14 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/go-playground/validator/v10"
-	"github.com/gravitl/netmaker/database"
-	"golang.org/x/crypto/bcrypt"
 	"math/rand"
 	"net"
 	"strings"
 	"time"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gravitl/netmaker/database"
+	"golang.org/x/crypto/bcrypt"
 )
 
 const charset = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"