diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-08 13:06:30 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-08 13:06:30 -0800 |
| commit | 0b0b5da2402af9f3674121c7f71e8706b63f8f1a (patch) | |
| tree | 9fdfcc86b9d71f7a93f2978bf460879aea1b0e6f /service/OneService.cpp | |
| parent | 9c7ee5a21e2875baf3b1643101f660f41c903124 (diff) | |
| parent | f7b3ffe8a0ddab78a547560d164223747c93c4db (diff) | |
| download | infinitytier-0b0b5da2402af9f3674121c7f71e8706b63f8f1a.tar.gz infinitytier-0b0b5da2402af9f3674121c7f71e8706b63f8f1a.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 686806b3..71bb6983 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1609,12 +1609,14 @@ public: bool haveRoute = false; // Ignore routes implied by local managed IPs since adding the IP adds the route + /* 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; } } + */ if (haveRoute) continue; |