From f7b3ffe8a0ddab78a547560d164223747c93c4db Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 5 Jan 2018 17:10:59 -0800 Subject: Commented out block which ignores added routes if there already exists an IP in the route's range. Attempted fix for #600 --- osdep/ManagedRoute.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'osdep') 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 -- cgit v1.2.3