ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 21:28:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not unite() peers across different IP scopes as this would pretty much never work.

Browse Source
This commit is contained in:
Adam Ierymenko
2015-04-26 16:03:16 -07:00
parent 8c5ec54711
commit a1005ca858
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
node/Switch.cpp
View File

@ -296,6 +296,9 @@ bool Switch::unite(const Address &p1,const Address &p2,bool force)
if (!(cg.first)) if (!(cg.first))
return false; return false;
if (cg.first.ipScope() != cg.second.ipScope())
return false;
// Addresses are sorted in key for last unite attempt map for order // Addresses are sorted in key for last unite attempt map for order
// invariant lookup: (p1,p2) == (p2,p1) // invariant lookup: (p1,p2) == (p2,p1)
Array<Address,2> uniteKey; Array<Address,2> uniteKey;