diff options
author | neutronscott <dn42@scottn.us> | 2018-02-03 14:53:46 -0500 |
---|---|---|
committer | neutronscott <dn42@scottn.us> | 2018-02-03 14:53:46 -0500 |
commit | 73ca9b6373a758bcba7d589064dd2cfb27208d3a (patch) | |
tree | 4baea1850f0f4c9e331372c9f6117c698ab63bb9 /service | |
parent | c6949aad2ddacf36f191bbda58450ae57d9c59c3 (diff) | |
download | infinitytier-73ca9b6373a758bcba7d589064dd2cfb27208d3a.tar.gz infinitytier-73ca9b6373a758bcba7d589064dd2cfb27208d3a.zip |
check physical blacklist for interface binding as well
Diffstat (limited to 'service')
-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 27b71141..250e4b38 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) { |