github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-16 10:03:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wire through external path lookup. Static paths should now work.

Browse source
This commit is contained in:
Adam Ierymenko 2016-11-22 14:23:13 -08:00
parent c6c578ce1d
commit 84732fcb12
7 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
service/OneService.cpp
View file

@ -1163,6 +1163,7 @@ public:
// Internal implementation methods -----------------------------------------
// Must be called after _localConfig is read or modified
void applyLocalConfig()
{
Mutex::Lock _l(_localConfig_m);
@ -1872,6 +1873,12 @@ public:
}
}
/* 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 recursion problems. */
// Check blacklists
const Hashtable< uint64_t,std::vector<InetAddress> > *blh = (const Hashtable< uint64_t,std::vector<InetAddress> > *)0;
const std::vector<InetAddress> *gbl = (const std::vector<InetAddress> *)0;
@ -1897,12 +1904,6 @@ public:
}
}
/* 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;
}