zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 00:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing logic for port setting

Browse Source
This commit is contained in:
afeiszli
2022-05-20 08:38:32 -04:00
committed by 0xdcarns
parent 24b03aa0f1
commit e8f667872e
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
netclient/functions/join.go
View File

@@ -42,6 +42,11 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
if cfg.Node.Password == "" {
cfg.Node.Password = logic.GenKey()
}
manualPort := false
if cfg.Node.ListenPort != 0 {
cfg.Node.UDPHolePunch = "no"
manualPort = true
}
var trafficPubKey, trafficPrivKey, errT = box.GenerateKey(rand.Reader) // generate traffic keys
if errT != nil {
return errT
@@ -164,10 +169,11 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
}
}
logger.Log(1, "node created on remote server...updating configs")
// keep track of the old listenport value
oldListenPort := node.ListenPort
cfg.Node = node
setListenPort(oldListenPort, cfg)
logger.Log(0, "UDP Hole Punch: "+cfg.Node.UDPHolePunch)
if !manualPort && (cfg.Node.UDPHolePunch == "no") {
setListenPort(cfg)
}
err = config.ModConfig(&cfg.Node)
if err != nil {
return err
@@ -215,22 +221,19 @@ func formatName(node models.Node) string {
return node.Name
}
func setListenPort(oldListenPort int32, cfg *config.ClientConfig) {
func setListenPort(cfg *config.ClientConfig) {
// keep track of the returned listenport value
newListenPort := cfg.Node.ListenPort
var errN error
// get free port based on returned default listen port
cfg.Node.ListenPort, errN = ncutils.GetFreePort(cfg.Node.ListenPort)
if errN != nil {
cfg.Node.ListenPort = newListenPort
logger.Log(1, "Error retrieving port: ", errN.Error())
}
if newListenPort != oldListenPort {
var errN error
// get free port based on returned default listen port
cfg.Node.ListenPort, errN = ncutils.GetFreePort(cfg.Node.ListenPort)
if errN != nil {
cfg.Node.ListenPort = newListenPort
logger.Log(1, "Error retrieving port: ", errN.Error())
}
// if newListenPort has been modified to find an available port, publish to server
if cfg.Node.ListenPort != newListenPort {
PublishNodeUpdate(cfg)
}
// if newListenPort has been modified to find an available port, publish to server
if cfg.Node.ListenPort != newListenPort {
PublishNodeUpdate(cfg)
}
}