summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-11-29 04:47:16 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-11-29 04:47:16 -0800
commitc26bf45e28fcf74ce2f0adff5a67787794c30940 (patch)
tree238bc62158e51f431d235e3258eaac714183bf04 /service
parent23e5c7b38df504868089607491f8114b473f175f (diff)
parent382dd82eb62ba41b6051af92ce749809a3b61ed7 (diff)
downloadinfinitytier-c26bf45e28fcf74ce2f0adff5a67787794c30940.tar.gz
infinitytier-c26bf45e28fcf74ce2f0adff5a67787794c30940.zip
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service')
-rw-r--r--service/OneService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index b767dea8..b30dc390 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -1411,7 +1411,7 @@ public:
json &blAddrs = v.value()["blacklist"];
if (blAddrs.is_array()) {
for(unsigned long i=0;i<blAddrs.size();++i) {
- const InetAddress ip(OSUtils::jsonString(tryAddrs[i],"").c_str());
+ const InetAddress ip(OSUtils::jsonString(blAddrs[i],"").c_str());
if (ip.ss_family == AF_INET)
v4b.push_back(ip);
else if (ip.ss_family == AF_INET6)