From f18d5b2efeb728ce79027890ef08307f2f41f787 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Mon, 27 Nov 2017 14:23:55 -0800
Subject: Attempted fix for github issue #597, leaking sockets. Added call to
 closenatpmp() after failure to init

---
 osdep/PortMapper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osdep/PortMapper.cpp b/osdep/PortMapper.cpp
index 825972b0..9aeeb8d6 100644
--- a/osdep/PortMapper.cpp
+++ b/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
-- 
cgit v1.2.3


From 382dd82eb62ba41b6051af92ce749809a3b61ed7 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Mon, 27 Nov 2017 15:31:25 -0800
Subject: Fix for local.conf virtual path blacklist (ticket #594)

---
 service/OneService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
cgit v1.2.3