From b2d048aa0e01a350eaf524cc752ca5fa9a5a1140 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 21 Jun 2016 07:32:58 -0700 Subject: Make Dictionary templatable so it can be used where we want a higher capacity. --- service/OneService.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'service') diff --git a/service/OneService.cpp b/service/OneService.cpp index 865a849e..804e3d36 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1571,6 +1571,7 @@ public: inline int nodePathCheckFunction(const struct sockaddr_storage *localAddr,const struct sockaddr_storage *remoteAddr) { Mutex::Lock _l(_nets_m); + for(std::map::const_iterator n(_nets.begin());n!=_nets.end();++n) { if (n->second.tap) { std::vector ips(n->second.tap->ips()); @@ -1581,7 +1582,13 @@ public: } } } - // TODO: also check routing table for L3 routes via ZeroTier managed devices + + /* Note: I do not think we need to scan for overlap with managed routes + * because of the "route forking" and interface binding that we do. This + * ensures (we hope) that ZeroTier traffic will still take the physical + * path even if its managed routes override this for other traffic. Will + * revisit if we see problems with this. */ + return 1; } -- cgit v1.2.3