void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use LinuxNetLink for routes on Linux... still needs testing/debugging on an actual Linux machine.

Browse source
This commit is contained in:
Adam Ierymenko 2020-11-13 18:16:14 -05:00
parent 16a878adb1
commit 6c5a097711
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
osdep/ManagedRoute.cpp
View file

@ -49,6 +49,9 @@
#include <utility> #include <utility>
#include "ManagedRoute.hpp" #include "ManagedRoute.hpp"
#ifdef __LINUX__
#include "LinuxNetLink.hpp"
#endif
#define ZT_BSD_ROUTE_CMD "/sbin/route" #define ZT_BSD_ROUTE_CMD "/sbin/route"
#define ZT_LINUX_IP_COMMAND "/sbin/ip" #define ZT_LINUX_IP_COMMAND "/sbin/ip"
@ -269,6 +272,8 @@ static void _routeCmd(const char *op,const InetAddress &target,const InetAddress
#ifdef __LINUX__ // ---------------------------------------------------------- #ifdef __LINUX__ // ----------------------------------------------------------
#define ZT_ROUTING_SUPPORT_FOUND 1 #define ZT_ROUTING_SUPPORT_FOUND 1
// This has been replaced by LinuxNetLink
/*
static void _routeCmd(const char *op,const InetAddress &target,const InetAddress &via,const char *localInterface) static void _routeCmd(const char *op,const InetAddress &target,const InetAddress &via,const char *localInterface)
{ {
long p = (long)fork(); long p = (long)fork();
@ -289,6 +294,7 @@ static void _routeCmd(const char *op,const InetAddress &target,const InetAddress
::_exit(-1); ::_exit(-1);
} }
} }
*/
#endif // __LINUX__ ---------------------------------------------------------- #endif // __LINUX__ ----------------------------------------------------------
@ -393,15 +399,19 @@ ManagedRoute::ManagedRoute(const InetAddress &target,const InetAddress &via,cons
_target = target; _target = target;
_via = via; _via = via;
_src = src; _src = src;
if (via.ss_family == AF_INET)
if (_via.ss_family == AF_INET) {
_via.setPort(32); _via.setPort(32);
else if (via.ss_family == AF_INET6) } else if (_via.ss_family == AF_INET6) {
_via.setPort(128); _via.setPort(128);
if (src.ss_family == AF_INET) { }
if (_src.ss_family == AF_INET) {
_src.setPort(32); _src.setPort(32);
} else if (src.ss_family == AF_INET6) { } else if (_src.ss_family == AF_INET6) {
_src.setPort(128); _src.setPort(128);
} }
Utils::scopy(_device,sizeof(_device),device); Utils::scopy(_device,sizeof(_device),device);
_systemDevice[0] = (char)0; _systemDevice[0] = (char)0;
} }
@ -510,11 +520,15 @@ bool ManagedRoute::sync()
if (!_applied.count(leftt)) { if (!_applied.count(leftt)) {
_applied[leftt] = false; // boolean unused _applied[leftt] = false; // boolean unused
_routeCmd("replace",leftt,_via,(_via) ? (const char *)0 : _device); LinuxNetLink::getInstance().delRoute(leftt, _via, _src, (_via) ? (const char *)0 : _device);
LinuxNetLink::getInstance().addRoute(leftt, _via, _src, (_via) ? (const char *)0 : _device);
//_routeCmd("replace",leftt,_via,(_via) ? (const char *)0 : _device);
} }
if ((rightt)&&(!_applied.count(rightt))) { if ((rightt)&&(!_applied.count(rightt))) {
_applied[rightt] = false; // boolean unused _applied[rightt] = false; // boolean unused
_routeCmd("replace",rightt,_via,(_via) ? (const char *)0 : _device); LinuxNetLink::getInstance().delRoute(rightt, _via, _src, (_via) ? (const char *)0 : _device);
LinuxNetLink::getInstance().addRoute(rightt, _via, _src, (_via) ? (const char *)0 : _device);
//_routeCmd("replace",rightt,_via,(_via) ? (const char *)0 : _device);
} }
#endif // __LINUX__ ---------------------------------------------------------- #endif // __LINUX__ ----------------------------------------------------------
@ -562,7 +576,8 @@ void ManagedRoute::remove()
#endif // __BSD__ ------------------------------------------------------------ #endif // __BSD__ ------------------------------------------------------------
#ifdef __LINUX__ // ---------------------------------------------------------- #ifdef __LINUX__ // ----------------------------------------------------------
_routeCmd("del",r->first,_via,(_via) ? (const char *)0 : _device); //_routeCmd("del",r->first,_via,(_via) ? (const char *)0 : _device);
LinuxNetLink::getInstance().delRoute(r->first,_via,_src,(_via) ? (const char *)0 : _device);
#endif // __LINUX__ ---------------------------------------------------------- #endif // __LINUX__ ----------------------------------------------------------
#ifdef __WINDOWS__ // -------------------------------------------------------- #ifdef __WINDOWS__ // --------------------------------------------------------

19
service/OneService.cpp
View file

@ -1951,12 +1951,13 @@ public:
const InetAddress *const target = reinterpret_cast<const InetAddress *>(&(n.config.routes[i].target)); 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)); const InetAddress *const via = reinterpret_cast<const InetAddress *>(&(n.config.routes[i].via));
// Make sure we are allowed to set this managed route. // Make sure we are allowed to set this managed route, and that 'via' is not our IP. The latter
// avoids setting routes via the router on the router.
if ( (!checkIfManagedIsAllowed(n,*target)) || ((via->ss_family == target->ss_family)&&(matchIpOnly(myIps,*via))) ) if ( (!checkIfManagedIsAllowed(n,*target)) || ((via->ss_family == target->ss_family)&&(matchIpOnly(myIps,*via))) )
continue; continue;
// Find an IP on the interface that can be a source IP, abort if no IPs assigned. // Find an IP on the interface that can be a source IP, abort if no IPs assigned.
const InetAddress *src = NULL; const InetAddress *src = nullptr;
unsigned int mostMatchingPrefixBits = 0; unsigned int mostMatchingPrefixBits = 0;
for(std::set<InetAddress>::const_iterator i(myIps.begin());i!=myIps.end();++i) { for(std::set<InetAddress>::const_iterator i(myIps.begin());i!=myIps.end();++i) {
const unsigned int matchingPrefixBits = i->matchingPrefixBits(*target); const unsigned int matchingPrefixBits = i->matchingPrefixBits(*target);
@ -1968,6 +1969,20 @@ public:
if (!src) if (!src)
continue; continue;
// Ignore routes implied by local managed IPs since adding the IP adds the route.
// Apple on the other hand seems to need this at least on some versions.
#ifndef __APPLE__
bool haveRoute = false;
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;
#endif
haveRouteTargets.insert(*target); haveRouteTargets.insert(*target);
#ifndef ZT_SDK #ifndef ZT_SDK