diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-08 13:06:30 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-08 13:06:30 -0800 |
| commit | 0b0b5da2402af9f3674121c7f71e8706b63f8f1a (patch) | |
| tree | 9fdfcc86b9d71f7a93f2978bf460879aea1b0e6f | |
| parent | 9c7ee5a21e2875baf3b1643101f660f41c903124 (diff) | |
| parent | f7b3ffe8a0ddab78a547560d164223747c93c4db (diff) | |
| download | infinitytier-0b0b5da2402af9f3674121c7f71e8706b63f8f1a.tar.gz infinitytier-0b0b5da2402af9f3674121c7f71e8706b63f8f1a.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
| -rw-r--r-- | osdep/ManagedRoute.cpp | 5 | ||||
| -rw-r--r-- | service/OneService.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp index a3746572..2289b23a 100644 --- a/osdep/ManagedRoute.cpp +++ b/osdep/ManagedRoute.cpp @@ -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 diff --git a/service/OneService.cpp b/service/OneService.cpp index 686806b3..71bb6983 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -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; |