diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-06-12 09:38:52 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-06-12 09:38:52 -0700 |
| commit | 817b9d012e2d345b77b12537e3857b575941f9c2 (patch) | |
| tree | 3c00e166df6c2405c260fa2ce651296e59673b28 /service | |
| parent | d55c732e1915affd2f40321261bb8178fa28f95a (diff) | |
| parent | dce9cb27c1f464cb4a5111c27502d8ca1d7297de (diff) | |
| download | infinitytier-817b9d012e2d345b77b12537e3857b575941f9c2.tar.gz infinitytier-817b9d012e2d345b77b12537e3857b575941f9c2.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 04d8c8df..91cf49ee 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1608,11 +1608,13 @@ public: // Nuke applied routes that are no longer in n.config.routes[] and/or are not allowed for(std::list< SharedPtr<ManagedRoute> >::iterator mr(n.managedRoutes.begin());mr!=n.managedRoutes.end();) { bool haveRoute = false; + if ( (checkIfManagedIsAllowed(n,(*mr)->target())) && (((*mr)->via().ss_family != (*mr)->target().ss_family)||(!matchIpOnly(myIps,(*mr)->via()))) ) { for(unsigned int i=0;i<n.config.routeCount;++i) { const InetAddress *const target = reinterpret_cast<const InetAddress *>(&(n.config.routes[i].target)); const InetAddress *const via = reinterpret_cast<const InetAddress *>(&(n.config.routes[i].via)); - if ( ((*mr)->target() == *target) && ( ((via->ss_family == target->ss_family)&&((*mr)->via().ipsEqual(*via))) || (tapdev == (*mr)->device()) ) ) { + + if ( ((*mr)->target() == *target) && ( ((via->ss_family == target->ss_family)&&((*mr)->via().ipsEqual(*via))) || (strcmp(tapdev,(*mr)->device())==0) ) ) { haveRoute = true; break; } |