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

Linux netlink and route setting... work in progress.

Browse source
This commit is contained in:
Adam Ierymenko 2020-11-13 19:07:54 -05:00
parent 6c5a097711
commit e8be28734b
3 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
osdep/LinuxNetLink.cpp
View file

@ -13,6 +13,8 @@
#include "../node/Constants.hpp" #include "../node/Constants.hpp"
#define ZT_NETLINK_TRACE
#ifdef __LINUX__ #ifdef __LINUX__
#include "LinuxNetLink.hpp" #include "LinuxNetLink.hpp"
@ -85,7 +87,7 @@ void LinuxNetLink::_setSocketTimeout(int fd, int seconds)
tv.tv_sec = seconds; tv.tv_sec = seconds;
tv.tv_usec = 0; tv.tv_usec = 0;
if(setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) != 0) { if(setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) != 0) {
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
fprintf(stderr, "setsockopt failed: %s\n", strerror(errno)); fprintf(stderr, "setsockopt failed: %s\n", strerror(errno));
#endif #endif
} }
@ -119,8 +121,8 @@ int LinuxNetLink::_doRecv(int fd)
if(nlp->nlmsg_type == NLMSG_ERROR && (nlp->nlmsg_flags & NLM_F_ACK) != NLM_F_ACK) { if(nlp->nlmsg_type == NLMSG_ERROR && (nlp->nlmsg_flags & NLM_F_ACK) != NLM_F_ACK) {
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(nlp); struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(nlp);
if (err->error != 0) { if (err->error != 0) {
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//fprintf(stderr, "rtnetlink error: %s\n", strerror(-(err->error))); fprintf(stderr, "rtnetlink error: %s\n", strerror(-(err->error)));
#endif #endif
} }
p = buf; p = buf;
@ -145,7 +147,7 @@ int LinuxNetLink::_doRecv(int fd)
} }
if (nlp->nlmsg_type == NLMSG_OVERRUN) { if (nlp->nlmsg_type == NLMSG_OVERRUN) {
//#ifdef ZT_TRACE //#ifdef ZT_NETLINK_TRACE
fprintf(stderr, "NLMSG_OVERRUN: Data lost\n"); fprintf(stderr, "NLMSG_OVERRUN: Data lost\n");
//#endif //#endif
p = buf; p = buf;
@ -242,8 +244,8 @@ void LinuxNetLink::_ipAddressAdded(struct nlmsghdr *nlp)
} }
} }
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//fprintf(stderr,"Added IP Address %s local: %s label: %s broadcast: %s\n", addr, local, label, bcast); fprintf(stderr,"Added IP Address %s local: %s label: %s broadcast: %s\n", addr, local, label, bcast);
#endif #endif
} }
@ -276,8 +278,8 @@ void LinuxNetLink::_ipAddressDeleted(struct nlmsghdr *nlp)
} }
} }
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//fprintf(stderr, "Removed IP Address %s local: %s label: %s broadcast: %s\n", addr, local, label, bcast); fprintf(stderr, "Removed IP Address %s local: %s label: %s broadcast: %s\n", addr, local, label, bcast);
#endif #endif
} }
@ -313,8 +315,8 @@ void LinuxNetLink::_routeAdded(struct nlmsghdr *nlp)
} }
sprintf(ms, "%d", rtp->rtm_dst_len); sprintf(ms, "%d", rtp->rtm_dst_len);
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//fprintf(stderr, "Route Added: dst %s/%s gw %s src %s if %s\n", dsts, ms, gws, srcs, ifs); fprintf(stderr, "Route Added: dst %s/%s gw %s src %s if %s\n", dsts, ms, gws, srcs, ifs);
#endif #endif
} }
@ -350,8 +352,8 @@ void LinuxNetLink::_routeDeleted(struct nlmsghdr *nlp)
} }
sprintf(ms, "%d", rtp->rtm_dst_len); sprintf(ms, "%d", rtp->rtm_dst_len);
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//fprintf(stderr, "Route Deleted: dst %s/%s gw %s src %s if %s\n", dsts, ms, gws, srcs, ifs); fprintf(stderr, "Route Deleted: dst %s/%s gw %s src %s if %s\n", dsts, ms, gws, srcs, ifs);
#endif #endif
} }
@ -605,11 +607,11 @@ void LinuxNetLink::addRoute(const InetAddress &target, const InetAddress &via, c
return; return;
} }
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//char tmp[64]; char tmp[64];
//char tmp2[64]; char tmp2[64];
//char tmp3[64]; char tmp3[64];
//fprintf(stderr, "Adding Route. target: %s via: %s src: %s iface: %s\n", target.toString(tmp), via.toString(tmp2), src.toString(tmp3), ifaceName); fprintf(stderr, "Adding Route. target: %s via: %s src: %s iface: %s\n", target.toString(tmp), via.toString(tmp2), src.toString(tmp3), ifaceName);
#endif #endif
int rtl = sizeof(struct rtmsg); int rtl = sizeof(struct rtmsg);
@ -720,11 +722,11 @@ void LinuxNetLink::delRoute(const InetAddress &target, const InetAddress &via, c
return; return;
} }
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//char tmp[64]; char tmp[64];
//char tmp2[64]; char tmp2[64];
//char tmp3[64]; char tmp3[64];
//fprintf(stderr, "Removing Route. target: %s via: %s src: %s iface: %s\n", target.toString(tmp), via.toString(tmp2), src.toString(tmp3), ifaceName); fprintf(stderr, "Removing Route. target: %s via: %s src: %s iface: %s\n", target.toString(tmp), via.toString(tmp2), src.toString(tmp3), ifaceName);
#endif #endif
int rtl = sizeof(struct rtmsg); int rtl = sizeof(struct rtmsg);
@ -839,9 +841,9 @@ void LinuxNetLink::addAddress(const InetAddress &addr, const char *iface)
return; return;
} }
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//char tmp[128]; char tmp[128];
//fprintf(stderr, "Adding IP address %s to interface %s", addr.toString(tmp), iface); fprintf(stderr, "Adding IP address %s to interface %s\n", addr.toString(tmp), iface);
#endif #endif
int interface_index = _indexForInterface(iface); int interface_index = _indexForInterface(iface);
@ -955,9 +957,9 @@ void LinuxNetLink::removeAddress(const InetAddress &addr, const char *iface)
return; return;
} }
#ifdef ZT_TRACE #ifdef ZT_NETLINK_TRACE
//char tmp[128]; char tmp[128];
//fprintf(stderr, "Removing IP address %s from interface %s", addr.toString(tmp), iface); fprintf(stderr, "Removing IP address %s from interface %s\n", addr.toString(tmp), iface);
#endif #endif
int interface_index = _indexForInterface(iface); int interface_index = _indexForInterface(iface);

4
osdep/ManagedRoute.cpp
View file

@ -520,13 +520,13 @@ bool ManagedRoute::sync()
if (!_applied.count(leftt)) { if (!_applied.count(leftt)) {
_applied[leftt] = false; // boolean unused _applied[leftt] = false; // boolean unused
LinuxNetLink::getInstance().delRoute(leftt, _via, _src, (_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); LinuxNetLink::getInstance().addRoute(leftt, _via, _src, (_via) ? (const char *)0 : _device);
//_routeCmd("replace",leftt,_via,(_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
LinuxNetLink::getInstance().delRoute(rightt, _via, _src, (_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); LinuxNetLink::getInstance().addRoute(rightt, _via, _src, (_via) ? (const char *)0 : _device);
//_routeCmd("replace",rightt,_via,(_via) ? (const char *)0 : _device); //_routeCmd("replace",rightt,_via,(_via) ? (const char *)0 : _device);
} }

13
service/OneService.cpp
View file

@ -1989,7 +1989,6 @@ public:
SharedPtr<ManagedRoute> &mr = n.managedRoutes[*target]; SharedPtr<ManagedRoute> &mr = n.managedRoutes[*target];
if (!mr) if (!mr)
mr.set(new ManagedRoute(*target, *via, *src, tapdev.c_str())); mr.set(new ManagedRoute(*target, *via, *src, tapdev.c_str()));
mr->sync();
#endif #endif
} }
@ -1998,6 +1997,18 @@ public:
n.managedRoutes.erase(r++); n.managedRoutes.erase(r++);
else ++r; else ++r;
} }
// Sync device-local managed routes first, then indirect results. That way
// we don't get destination unreachable for routes that are via things
// that do not yet have routes in the system.
for(std::map< InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes.begin());r!=n.managedRoutes.end();++r) {
if (!r->second->via())
r->second->sync();
}
for(std::map< InetAddress, SharedPtr<ManagedRoute> >::iterator r(n.managedRoutes.begin());r!=n.managedRoutes.end();++r) {
if (r->second->via())
r->second->sync();
}
} }
if (syncDns) { if (syncDns) {