void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Adam Ierymenko 2017-11-29 04:47:16 -08:00
commit c26bf45e28
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
osdep/PortMapper.cpp
View file

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

2
service/OneService.cpp
View file

@ -1411,7 +1411,7 @@ public:
json &blAddrs = v.value()["blacklist"]; json &blAddrs = v.value()["blacklist"];
if (blAddrs.is_array()) { if (blAddrs.is_array()) {
for(unsigned long i=0;i<blAddrs.size();++i) { 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) if (ip.ss_family == AF_INET)
v4b.push_back(ip); v4b.push_back(ip);
else if (ip.ss_family == AF_INET6) else if (ip.ss_family == AF_INET6)