ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-18 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ticket #915, added allowSecondaryPort to optionally force ZT to use a single port

Browse Source
This commit is contained in:
Joseph Henry 2019-07-09 10:31:03 -07:00
parent b2c4b7e99f
commit 389331ca29
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
service/OneService.cpp
View File

@ -475,6 +475,7 @@ public:
PhySocket *_localControlSocket6; PhySocket *_localControlSocket6;
bool _updateAutoApply; bool _updateAutoApply;
bool _allowTcpFallbackRelay; bool _allowTcpFallbackRelay;
bool _allowSecondaryPort;
unsigned int _multipathMode; unsigned int _multipathMode;
unsigned int _primaryPort; unsigned int _primaryPort;
unsigned int _secondaryPort; unsigned int _secondaryPort;
@ -722,16 +723,18 @@ public:
// This exists because there are buggy NATs out there that fail if more // This exists because there are buggy NATs out there that fail if more
// than one device behind the same NAT tries to use the same internal // than one device behind the same NAT tries to use the same internal
// private address port number. Buggy NATs are a running theme. // private address port number. Buggy NATs are a running theme.
_ports[1] = (_secondaryPort == 0) ? 20000 + ((unsigned int)_node->address() % 45500) : _secondaryPort; if (_allowSecondaryPort) {
for(int i=0;;++i) { _ports[1] = (_secondaryPort == 0) ? 20000 + ((unsigned int)_node->address() % 45500) : _secondaryPort;
if (i > 1000) { for(int i=0;;++i) {
_ports[1] = 0; if (i > 1000) {
break; _ports[1] = 0;
} else if (++_ports[1] >= 65536) { break;
_ports[1] = 20000; } else if (++_ports[1] >= 65536) {
_ports[1] = 20000;
}
if (_trialBind(_ports[1]))
break;
} }
if (_trialBind(_ports[1]))
break;
} }
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
@ -1603,6 +1606,7 @@ public:
_primaryPort = (unsigned int)OSUtils::jsonInt(settings["primaryPort"],(uint64_t)_primaryPort) & 0xffff; _primaryPort = (unsigned int)OSUtils::jsonInt(settings["primaryPort"],(uint64_t)_primaryPort) & 0xffff;
_allowTcpFallbackRelay = OSUtils::jsonBool(settings["allowTcpFallbackRelay"],true); _allowTcpFallbackRelay = OSUtils::jsonBool(settings["allowTcpFallbackRelay"],true);
_allowSecondaryPort = OSUtils::jsonBool(settings["allowSecondaryPort"],true);
_secondaryPort = (unsigned int)OSUtils::jsonInt(settings["secondaryPort"],0); _secondaryPort = (unsigned int)OSUtils::jsonInt(settings["secondaryPort"],0);
_tertiaryPort = (unsigned int)OSUtils::jsonInt(settings["tertiaryPort"],0); _tertiaryPort = (unsigned int)OSUtils::jsonInt(settings["tertiaryPort"],0);
if (_secondaryPort != 0 || _tertiaryPort != 0) { if (_secondaryPort != 0 || _tertiaryPort != 0) {