Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

osdep/PortMapper.cpp

@@ -123,6 +123,7 @@ public:
 
 					if (initnatpmp(&natpmp,0,0) != 0) {
 						mode = 1;
+						closenatpmp(&natpmp);
 #ifdef ZT_PORTMAPPER_TRACE
                         PM_TRACE("PortMapper: NAT-PMP: init failed, switching to UPnP mode" ZT_EOL_S);
 #endif

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)