diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-06-04 12:24:12 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-06-04 12:24:12 -0700 |
| commit | b22405b64b0b26fa1d5d8932cf212e4ae7760632 (patch) | |
| tree | da89cf3c11b272b9334c903bda17863af56c27bc /service | |
| parent | 62210e57f1c81aec43b714b22313f8c3a0569e2c (diff) | |
| download | infinitytier-b22405b64b0b26fa1d5d8932cf212e4ae7760632.tar.gz infinitytier-b22405b64b0b26fa1d5d8932cf212e4ae7760632.zip | |
rtnetlink integrated. no more callouts to iproute2
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 91cf49ee..1851c88c 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1631,6 +1631,17 @@ public: 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)); + InetAddress *src = NULL; + for (unsigned int j=0; j<n.config.assignedAddressCount; ++j) { + const InetAddress *const tmp = reinterpret_cast<const InetAddress *>(&(n.config.assignedAddresses[j])); + if (target->isV4() && tmp->isV4()) { + src = reinterpret_cast<InetAddress *>(&(n.config.assignedAddresses[j])); + break; + } else if (target->isV6() && tmp->isV6()) { + src = reinterpret_cast<InetAddress *>(&(n.config.assignedAddresses[j])); + break; + } + } if ( (!checkIfManagedIsAllowed(n,*target)) || ((via->ss_family == target->ss_family)&&(matchIpOnly(myIps,*via))) ) continue; @@ -1662,7 +1673,7 @@ public: continue; // Add and apply new routes - n.managedRoutes.push_back(SharedPtr<ManagedRoute>(new ManagedRoute(*target,*via,tapdev))); + n.managedRoutes.push_back(SharedPtr<ManagedRoute>(new ManagedRoute(*target,*via,*src,tapdev))); if (!n.managedRoutes.back()->sync()) n.managedRoutes.pop_back(); } |