summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-09-12 14:56:18 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-09-12 14:56:18 -0700
commit34b146f28bf09bf3c048f723c8fad144a0a37837 (patch)
tree73681ea72bb92947251c77312bcba3afbbc08e32
parentfb46a546db69ea578b8abc5451fc03cb91dd38cf (diff)
downloadinfinitytier-34b146f28bf09bf3c048f723c8fad144a0a37837.tar.gz
infinitytier-34b146f28bf09bf3c048f723c8fad144a0a37837.zip
Back out of GitHub issue #385 for now and maybe for this release. Would be nice but it is non-critical and rules are the priority. Current implementation bangs heads with OSX route assignment on WiFi join, etc.
-rw-r--r--osdep/ManagedRoute.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp
index 15ca3c03..00f95850 100644
--- a/osdep/ManagedRoute.cpp
+++ b/osdep/ManagedRoute.cpp
@@ -435,7 +435,7 @@ bool ManagedRoute::sync()
}
}
- if (_systemVia) {
+ // if (_systemVia) {
if (!_applied.count(leftt)) {
_applied.insert(leftt);
_routeCmd("add",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
@@ -446,11 +446,11 @@ bool ManagedRoute::sync()
_routeCmd("add",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
_routeCmd("change",rightt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
}
- if (_applied.count(_target)) {
+ /*if (_applied.count(_target)) {
_applied.erase(_target);
_routeCmd("delete",_target,_via,(const char *)0,(_via) ? (const char *)0 : _device);
- }
- } else {
+ }*/
+ /*} else {
if (_applied.count(leftt)) {
_applied.erase(leftt);
_routeCmd("delete",leftt,_via,(const char *)0,(_via) ? (const char *)0 : _device);
@@ -464,7 +464,7 @@ bool ManagedRoute::sync()
_routeCmd("add",_target,_via,(const char *)0,(_via) ? (const char *)0 : _device);
_routeCmd("change",_target,_via,(const char *)0,(_via) ? (const char *)0 : _device);
}
- }
+ }*/
#endif // __BSD__ ------------------------------------------------------------
@@ -502,7 +502,7 @@ bool ManagedRoute::sync()
#ifdef __WINDOWS__ // --------------------------------------------------------
- if (needBifurcation) {
+ //if (needBifurcation) {
if (!_applied.count(leftt)) {
_applied.insert(leftt);
_winRoute(false,interfaceLuid,interfaceIndex,leftt,_via);
@@ -511,11 +511,11 @@ bool ManagedRoute::sync()
_applied.insert(rightt);
_winRoute(false,interfaceLuid,interfaceIndex,rightt,_via);
}
- if (_applied.count(_target)) {
+ /*if (_applied.count(_target)) {
_applied.erase(_target);
_winRoute(true,interfaceLuid,interfaceIndex,_target,_via);
- }
- } else {
+ }*/
+ /*} else {
if (_applied.count(leftt)) {
_applied.erase(leftt);
_winRoute(true,interfaceLuid,interfaceIndex,leftt,_via);
@@ -528,7 +528,7 @@ bool ManagedRoute::sync()
_applied.insert(_target);
_winRoute(false,interfaceLuid,interfaceIndex,_target,_via);
}
- }
+ }*/
#endif // __WINDOWS__ --------------------------------------------------------