diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-06-23 16:05:58 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-06-23 16:05:58 -0700 |
| commit | 75a6a7bacaeadceaf2be01eef36f5df2e0f51d81 (patch) | |
| tree | 4b53ff494fdacfb73c3256c0ab269121aeb019c0 | |
| parent | 951d911531ec1eaa246e234a7b31b6bf5bc6bb79 (diff) | |
| parent | 7bc9666aacc693105e6ad103610ee949604ed5c2 (diff) | |
| download | infinitytier-75a6a7bacaeadceaf2be01eef36f5df2e0f51d81.tar.gz infinitytier-75a6a7bacaeadceaf2be01eef36f5df2e0f51d81.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
| -rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 8fc76e31..0fadc191 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1059,7 +1059,7 @@ public: for(it = _nets.begin(); it != _nets.end(); it++) { if(it->second.tap) { for(int j=0; j<it->second.tap->_ips.size(); j++) { - if(it->second.tap->_ips[j].isEqualPrefix(addr) || it->second.tap->_ips[j].ipsEqual(addr)) { + if(it->second.tap->_ips[j].isEqualPrefix(addr) || it->second.tap->_ips[j].ipsEqual(addr) || it->second.tap->_ips[j].containsAddress(addr)) { return it->second.tap; } } |