diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-04 12:45:21 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-04 12:45:21 -0800 |
| commit | ac8918992b647c80c6da4b7c0956fd383b15e9d7 (patch) | |
| tree | 67dbe17f61a99c89cf8e5ba8b5df435b007b288e /service | |
| parent | cbf8d9c45b1e09d55f426a2c1cbaa7b9e1830950 (diff) | |
| parent | a4cfe4cd1650ea7e9aada0b004fd7aade2e43ced (diff) | |
| download | infinitytier-ac8918992b647c80c6da4b7c0956fd383b15e9d7.tar.gz infinitytier-ac8918992b647c80c6da4b7c0956fd383b15e9d7.zip | |
Merge dev.
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 96da4274..c3204b5d 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -355,6 +355,26 @@ public: static BackgroundSoftwareUpdateChecker backgroundSoftwareUpdateChecker; #endif // ZT_AUTO_UPDATE +static bool isBlacklistedLocalInterfaceForZeroTierTraffic(const char *ifn) +{ +#if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux) + if ((ifn[0] == 'l')&&(ifn[1] == 'o')) return true; // loopback + if ((ifn[0] == 'z')&&(ifn[1] == 't')) return true; // sanity check: zt# + if ((ifn[0] == 't')&&(ifn[1] == 'u')&&(ifn[2] == 'n')) return true; // tun# is probably an OpenVPN tunnel or similar + if ((ifn[0] == 't')&&(ifn[1] == 'a')&&(ifn[2] == 'p')) return true; // tap# is probably an OpenVPN tunnel or similar +#endif + +#ifdef __APPLE__ + if ((ifn[0] == 'l')&&(ifn[1] == 'o')) return true; // loopback + if ((ifn[0] == 'z')&&(ifn[1] == 't')) return true; // sanity check: zt# + if ((ifn[0] == 't')&&(ifn[1] == 'u')&&(ifn[2] == 'n')) return true; // tun# is probably an OpenVPN tunnel or similar + if ((ifn[0] == 't')&&(ifn[1] == 'a')&&(ifn[2] == 'p')) return true; // tap# is probably an OpenVPN tunnel or similar + if ((ifn[0] == 'u')&&(ifn[1] == 't')&&(ifn[2] == 'u')&&(ifn[3] == 'n')) return true; // ... as is utun# +#endif + + return false; +} + static std::string _trimString(const std::string &s) { unsigned long end = (unsigned long)s.length(); @@ -768,7 +788,7 @@ public: if ((getifaddrs(&ifatbl) == 0)&&(ifatbl)) { struct ifaddrs *ifa = ifatbl; while (ifa) { - if ((ifa->ifa_name)&&(ifa->ifa_addr)) { + if ((ifa->ifa_name)&&(ifa->ifa_addr)&&(!isBlacklistedLocalInterfaceForZeroTierTraffic(ifa->ifa_name))) { bool isZT = false; for(std::vector<std::string>::const_iterator d(ztDevices.begin());d!=ztDevices.end();++d) { if (*d == ifa->ifa_name) { |