ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-30 17:56:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix IP scoping bug, and disable remotely reported surface push... not helping. :(

Browse Source
This commit is contained in:
Adam Ierymenko 2015-07-27 17:28:13 -07:00
parent fadb291962
commit e99eda4a4a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/InetAddress.cpp
View File

@ -74,7 +74,7 @@ InetAddress::IpScope InetAddress::ipScope() const
if ((ip & 0xfff00000) == 0xac100000) return IP_SCOPE_PRIVATE; // 172.16.0.0/12 if ((ip & 0xfff00000) == 0xac100000) return IP_SCOPE_PRIVATE; // 172.16.0.0/12
break; break;
case 0xc0: case 0xc0:
if ((ip & 0xffff0000) == 0xc9a80000) return IP_SCOPE_PRIVATE; // 192.168.0.0/16 if ((ip & 0xffff0000) == 0xc0a80000) return IP_SCOPE_PRIVATE; // 192.168.0.0/16
break; break;
case 0xff: return IP_SCOPE_NONE; // 255.0.0.0/8 (broadcast, or unused/unusable) case 0xff: return IP_SCOPE_NONE; // 255.0.0.0/8 (broadcast, or unused/unusable)
default: default:

11
node/Peer.cpp
View File

@ -226,15 +226,13 @@ void Peer::doPingAndKeepalive(const RuntimeEnvironment *RR,uint64_t now)
void Peer::pushDirectPaths(const RuntimeEnvironment *RR,RemotePath *path,uint64_t now,bool force) void Peer::pushDirectPaths(const RuntimeEnvironment *RR,RemotePath *path,uint64_t now,bool force)
{ {
if ((((now - _lastDirectPathPush) >= ZT_DIRECT_PATH_PUSH_INTERVAL)||(force))) { if ((true)||(((now - _lastDirectPathPush) >= ZT_DIRECT_PATH_PUSH_INTERVAL)||(force))) {
_lastDirectPathPush = now; _lastDirectPathPush = now;
std::vector<Path> dps(RR->node->directPaths()); std::vector<Path> dps(RR->node->directPaths());
/* Also push paths reported to us by non-root-server peers. This assists // Push peer-reported surface -- tried this and it didn't help much with difficult NATs so commenting out.
* with NAT traversal behind NATs that engage in strange or randomized /*
* port assignment behavior. */
std::vector<Address> rootAddresses(RR->topology->rootAddresses());
std::vector< std::pair<Address,InetAddress> > surface(RR->sa->getReportedSurface()); std::vector< std::pair<Address,InetAddress> > surface(RR->sa->getReportedSurface());
for(std::vector< std::pair<Address,InetAddress> >::const_iterator s(surface.begin());s!=surface.end();++s) { for(std::vector< std::pair<Address,InetAddress> >::const_iterator s(surface.begin());s!=surface.end();++s) {
bool alreadyHave = false; bool alreadyHave = false;
@ -244,9 +242,10 @@ void Peer::pushDirectPaths(const RuntimeEnvironment *RR,RemotePath *path,uint64_
break; break;
} }
} }
if ((!alreadyHave)&&(std::find(rootAddresses.begin(),rootAddresses.end(),s->first) == rootAddresses.end())) if (!alreadyHave)
dps.push_back(Path(s->second,0,Path::TRUST_NORMAL)); dps.push_back(Path(s->second,0,Path::TRUST_NORMAL));
} }
*/
#ifdef ZT_TRACE #ifdef ZT_TRACE
{ {