From 212b31616c9ca262a5cbf55aea993549efab71a0 Mon Sep 17 00:00:00 2001
From: Ross Nicoll <jrn@jrn.me.uk>
Date: Sat, 10 Oct 2015 16:14:26 +0000
Subject: Merge in miniupnpc updates from Bitcoin Core

Contains:

0cca0248f030ea32bd8de778b5a2782e0d191978
9f3e48e5219a09b5ddfd6883d1f0498910eff4b6
888c595cffe73b0d49434acf49a9611cbff1ea1d
00c5a73136e13813219c7b0846fa1bfd91757e5d
---
 src/net.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/net.cpp')

diff --git a/src/net.cpp b/src/net.cpp
index ce5cd29de..e8df36308 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -995,10 +995,14 @@ void ThreadMapPort()
 #ifndef UPNPDISCOVER_SUCCESS
     /* miniupnpc 1.5 */
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
-#else
+#elif MINIUPNPC_API_VERSION < 14
     /* miniupnpc 1.6 */
     int error = 0;
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
+#else
+    /* miniupnpc 1.9.20150730 */
+    int error = 0;
+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
 #endif
 
     struct UPNPUrls urls;
-- 
cgit v1.2.3