diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-27 17:24:55 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-27 17:24:55 -0700 |
| commit | 73d68c0c988b6c5d038176700cf1055c8a865c7e (patch) | |
| tree | 90841348921187d6951f83e8716bdc6adc948eef /node/Switch.cpp | |
| parent | 4c71e92a672e64ad9b63bfde1ef742e7f2b7cec7 (diff) | |
| parent | 7dcde7503a50de02c37769b6c222ca3121f5d461 (diff) | |
| download | infinitytier-73d68c0c988b6c5d038176700cf1055c8a865c7e.tar.gz infinitytier-73d68c0c988b6c5d038176700cf1055c8a865c7e.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 8c27fdfa..e2bc74c5 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -296,6 +296,9 @@ bool Switch::unite(const Address &p1,const Address &p2,bool force) if (!(cg.first)) return false; + if (cg.first.ipScope() != cg.second.ipScope()) + return false; + // Addresses are sorted in key for last unite attempt map for order // invariant lookup: (p1,p2) == (p2,p1) Array<Address,2> uniteKey; |