dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2018-01-08 13:06:30 -08:00
commit 0b0b5da240
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/OneService.cpp
View file

@ -1609,12 +1609,14 @@ public:
bool haveRoute = false;
// Ignore routes implied by local managed IPs since adding the IP adds the route
/*
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;