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

Cleaned up old code for attempted fix for ticket #600

Browse Source
This commit is contained in:
Joseph Henry 2018-01-09 09:59:55 -08:00
parent 6fbd15f8b2
commit 2e1bc6e500
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osdep/ManagedRoute.cpp
View File

@ -477,31 +477,6 @@ bool ManagedRoute::sync()
} }
} }
// Detect routes previously applied by ZT that don't exist in the system's route list. Re-apply these.
// NOTE: The following block was added in reaction to the macOS High Sierra 10.13.2 disappearing
// route issue. This comment should be removed once we're sure this block doesn't have any side-effects.
/*
// Commented out temporarily to test more generalized fix
bool found = false;
std::vector<_RTE> currRoutes(_getRTEs(_target,false));
for(std::vector<_RTE>::iterator r(currRoutes.begin());r!=currRoutes.end();++r) {
if(_target == r->target) {
found = true;
break;
}
}
if (!found) {
// erase _applied enteries
std::map<InetAddress, bool>::iterator rt;
rt = _applied.find(leftt);
_applied.erase(rt, _applied.end());
rt = _applied.find(rightt);
_applied.erase(rt, _applied.end());
}
*/
if (!_applied.count(leftt)) { if (!_applied.count(leftt)) {
_applied[leftt] = false; // not ifscoped _applied[leftt] = false; // not ifscoped
_routeCmd("add",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device); _routeCmd("add",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device);

1
service/OneService.cpp
View File

@ -1609,6 +1609,7 @@ public:
bool haveRoute = false; bool haveRoute = false;
// Ignore routes implied by local managed IPs since adding the IP adds the route // Ignore routes implied by local managed IPs since adding the IP adds the route
// Commented out to fix ticket #600 (disappearing routes on macOS). Remove this block when we're sure there's no side effects
/* /*
for(std::vector<InetAddress>::iterator ip(n.managedIps.begin());ip!=n.managedIps.end();++ip) { for(std::vector<InetAddress>::iterator ip(n.managedIps.begin());ip!=n.managedIps.end();++ip) {
if ((target->netmaskBits() == ip->netmaskBits())&&(target->containsAddress(*ip))) { if ((target->netmaskBits() == ip->netmaskBits())&&(target->containsAddress(*ip))) {