ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-03-10 22:44:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2018-01-08 13:06:30 -08:00
commit 0b0b5da240
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osdep/ManagedRoute.cpp
View File

@ -480,6 +480,10 @@ 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) {
@ -496,6 +500,7 @@ bool ManagedRoute::sync()
rt = _applied.find(rightt);
_applied.erase(rt, _applied.end());
}
*/
if (!_applied.count(leftt)) {
_applied[leftt] = false; // not ifscoped

2
service/OneService.cpp
View File

@ -1609,12 +1609,14 @@ public:
bool haveRoute = false;
// Ignore routes implied by local managed IPs since adding the IP adds the route
/*
for(std::vector<InetAddress>::iterator ip(n.managedIps.begin());ip!=n.managedIps.end();++ip) {
if ((target->netmaskBits() == ip->netmaskBits())&&(target->containsAddress(*ip))) {
haveRoute = true;
break;
}
}
*/
if (haveRoute)
continue;