diff options
| author | Joseph Henry <josephjah@gmail.com> | 2018-11-11 14:23:24 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2018-11-11 14:23:24 -0800 |
| commit | c6ae81fac751e02bfd898eb560a0efb38d037485 (patch) | |
| tree | c0170d2575be1b9262d62e3f59607470e51d5b89 | |
| parent | 79086f085803b1677e920472559ed6e043b1b4a1 (diff) | |
| download | infinitytier-c6ae81fac751e02bfd898eb560a0efb38d037485.tar.gz infinitytier-c6ae81fac751e02bfd898eb560a0efb38d037485.zip | |
Added preprocessor check for __APPLE__ as an attempted fix for ticket #600
| -rw-r--r-- | osdep/Binder.hpp | 2 | ||||
| -rw-r--r-- | service/OneService.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index 95efb641..be9d9ca3 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -373,7 +373,7 @@ public: tcps = phy.tcpListen(reinterpret_cast<const struct sockaddr *>(&(ii->first)),(void *)0); if ((udps)&&(tcps)) { #ifdef __LINUX__ - // Bind Linux sockets to their device so routes tha we manage do not override physical routes (wish all platforms had this!) + // Bind Linux sockets to their device so routes that we manage do not override physical routes (wish all platforms had this!) if (ii->second.length() > 0) { char tmp[256]; Utils::scopy(tmp,sizeof(tmp),ii->second.c_str()); 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<InetAddress>::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 |