From c6ae81fac751e02bfd898eb560a0efb38d037485 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Sun, 11 Nov 2018 14:23:24 -0800 Subject: Added preprocessor check for __APPLE__ as an attempted fix for ticket #600 --- service/OneService.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'service') diff --git a/service/OneService.cpp b/service/OneService.cpp index c3769d05..8c65cfb6 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1801,12 +1801,14 @@ public: bool haveRoute = false; // Ignore routes implied by local managed IPs since adding the IP adds the route +#ifndef __APPLE__ for(std::vector::iterator ip(n.managedIps.begin());ip!=n.managedIps.end();++ip) { if ((target->netmaskBits() == ip->netmaskBits())&&(target->containsAddress(*ip))) { haveRoute = true; break; } } +#endif if (haveRoute) continue; #ifndef ZT_SDK -- cgit v1.2.3 From 15649334a6dfffb95bc0df3743d78ab10b61b538 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sun, 11 Nov 2018 19:22:07 -0800 Subject: Do not use new "feth" devices for ZT traffic. --- service/OneService.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'service') diff --git a/service/OneService.cpp b/service/OneService.cpp index 8c65cfb6..b1419234 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -2745,6 +2745,7 @@ public: #endif #ifdef __APPLE__ + if ((ifname[0] == 'f')&&(ifname[1] == 'e')&&(ifname[2] == 't')&&(ifname[3] == 'h')) return false; // ... as is feth# if ((ifname[0] == 'l')&&(ifname[1] == 'o')) return false; // loopback if ((ifname[0] == 'z')&&(ifname[1] == 't')) return false; // sanity check: zt# if ((ifname[0] == 't')&&(ifname[1] == 'u')&&(ifname[2] == 'n')) return false; // tun# is probably an OpenVPN tunnel or similar -- cgit v1.2.3