gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport port selection logic from 1.6.X

Browse Source
This commit is contained in:
Joseph Henry
2021-06-01 11:36:19 -07:00
parent d5454040f0
commit 960bf5990d
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/NodeService.cpp
View File

@@ -272,15 +272,21 @@ NodeService::ReasonForTermination NodeService::run()
return _termReason; return _termReason;
} }
// Attempt to bind to a secondary port chosen from our ZeroTier // Attempt to bind to a secondary port.
// address. This exists because there are buggy NATs out there that // This exists because there are buggy NATs out there that fail if more
// fail if more than one device behind the same NAT tries to use the // than one device behind the same NAT tries to use the same internal
// same internal private address port number. Buggy NATs are a // private address port number. Buggy NATs are a running theme.
// running theme. //
// This used to pick the secondary port based on the node ID until we
// discovered another problem: buggy routers and malicious traffic
// "detection". A lot of routers have such things built in these days
// and mis-detect ZeroTier traffic as malicious and block it resulting
// in a node that appears to be in a coma. Secondary ports are now
// randomized on startup.
if (_allowSecondaryPort) { if (_allowSecondaryPort) {
//_ports[1] = (_secondaryPort == 0) ? minPort + ((unsigned int)_node->address() % maxPort) : _secondaryPort; unsigned int randp = 0;
_ports[1] = (_secondaryPort == 0) ? (((unsigned int)_node->address() % (maxPort - minPort + 1)) + minPort) Utils::getSecureRandom(&randp, sizeof(randp));
: _secondaryPort; _ports[1] = (_secondaryPort == 0) ? ((randp % (maxPort - minPort + 1)) + minPort) : _secondaryPort;
for (int i = 0;; ++i) { for (int i = 0;; ++i) {
if (i > 1000) { if (i > 1000) {
_ports[1] = 0; _ports[1] = 0;