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

Merge pull request #1105 from gravitl/bugfix_v0.14.1_ports

Browse Source 
fixing logic for port setting
This commit is contained in:
dcarns
2022-05-20 10:21:31 -04:00
committed by GitHub
parent ec8b2056e6 91fe618fae
commit d4bd11ec32
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 == "" { if cfg.Node.Password == "" {
cfg.Node.Password = logic.GenKey() 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 var trafficPubKey, trafficPrivKey, errT = box.GenerateKey(rand.Reader) // generate traffic keys
if errT != nil { if errT != nil {
return errT return errT
@@ -164,10 +169,11 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
} }
} }
logger.Log(1, "node created on remote server...updating configs") logger.Log(1, "node created on remote server...updating configs")
// keep track of the old listenport value
oldListenPort := node.ListenPort
cfg.Node = node cfg.Node = node
setListenPort(oldListenPort, cfg) logger.Log(1, "turn on UDP hole punching (dynamic port setting)? "+cfg.Node.UDPHolePunch)
if !manualPort && (cfg.Node.UDPHolePunch == "no") {
setListenPort(cfg)
}
err = config.ModConfig(&cfg.Node) err = config.ModConfig(&cfg.Node)
if err != nil { if err != nil {
return err return err
@@ -215,22 +221,19 @@ func formatName(node models.Node) string {
return node.Name return node.Name
} }
func setListenPort(oldListenPort int32, cfg *config.ClientConfig) { func setListenPort(cfg *config.ClientConfig) {
// keep track of the returned listenport value // keep track of the returned listenport value
newListenPort := cfg.Node.ListenPort 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 { // if newListenPort has been modified to find an available port, publish to server
var errN error if cfg.Node.ListenPort != newListenPort {
// get free port based on returned default listen port PublishNodeUpdate(cfg)
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)
}
} }
} }