aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorPatrick Lodder <[email protected]>2015-10-10 22:06:22 +0200
committerPatrick Lodder <[email protected]>2015-10-10 22:06:22 +0200
commitb8893fe7db0d1a6695649bf336b13c0470b67712 (patch)
treecf109ada676093a4ef9c71e227c2dfa7e67d19ce /src/net.cpp
parentMerge pull request #1270 from rnicoll/1.10-fixmes (diff)
parentMerge in miniupnpc updates from Bitcoin Core (diff)
downloaddiscoin-b8893fe7db0d1a6695649bf336b13c0470b67712.tar.xz
discoin-b8893fe7db0d1a6695649bf336b13c0470b67712.zip
Merge pull request #1294 from rnicoll/1.10-dev-miniupnpc
Merge in miniupnpc updates from Bitcoin Core
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp6
1 files changed, 5 insertions, 1 deletions
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;