diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-04-18 08:08:06 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-04-18 08:08:06 -0700 |
| commit | 94f41e233227d9742c19f96dc52c6994eab6cfbc (patch) | |
| tree | b05d84ca09d1cf7d54a63cd10fe5020a553b8ec9 /service/OneService.cpp | |
| parent | 3d2a50f81149a380dd0128a0e7e301f0e8620274 (diff) | |
| parent | c2ffbb8627d8cb83b4502dd506d7b3263822beef (diff) | |
| download | infinitytier-94f41e233227d9742c19f96dc52c6994eab6cfbc.tar.gz infinitytier-94f41e233227d9742c19f96dc52c6994eab6cfbc.zip | |
Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index abbd6e75..4d1c792f 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -2414,7 +2414,22 @@ public: return false; } } - + { + // Check global blacklists + const std::vector<InetAddress> *gbl = (const std::vector<InetAddress> *)0; + if (ifaddr.ss_family == AF_INET) { + gbl = &_globalV4Blacklist; + } else if (ifaddr.ss_family == AF_INET6) { + gbl = &_globalV6Blacklist; + } + if (gbl) { + Mutex::Lock _l(_localConfig_m); + for(std::vector<InetAddress>::const_iterator a(gbl->begin());a!=gbl->end();++a) { + if (a->containsAddress(ifaddr)) + return false; + } + } + } { Mutex::Lock _l(_nets_m); for(std::map<uint64_t,NetworkState>::const_iterator n(_nets.begin());n!=_nets.end();++n) { |