aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorPatrick Lodder <[email protected]>2016-02-21 16:49:03 +0100
committerPatrick Lodder <[email protected]>2016-02-21 16:49:03 +0100
commitf626f8f43672a940c7840577b007f3d0010c2179 (patch)
tree283a89be14a8c0f9166ff05eafa86de1e4711808 /src/net.cpp
parentMerge branch '1.8.3-dev' into 1.8-maint (diff)
parentMerge pull request #1309 from Sporklin/1.8.3-dev-Fixmanpagesports (diff)
downloaddiscoin-1.8-archive.tar.xz
discoin-1.8-archive.zip
Merge branch '1.8.3-dev' into 1.8-maint1.8-archive
merges the actually released 1.8.3 into 1.8-maint
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 279ee4d76..f7ea00051 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1109,10 +1109,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;