aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Nicoll <[email protected]>2015-10-12 20:17:51 +0100
committerRoss Nicoll <[email protected]>2015-10-12 20:17:51 +0100
commita66ba29af667cc9881b156130d3bb9de9bd01716 (patch)
tree25138bcc2d9066ffc0b327041da1c61a1a560a66
parentMerge pull request #1191 from langerhans/1.8.3-releaseprep (diff)
parentapply bitcoin patch for miniupnpc 1.9 (diff)
downloaddiscoin-a66ba29af667cc9881b156130d3bb9de9bd01716.tar.xz
discoin-a66ba29af667cc9881b156130d3bb9de9bd01716.zip
Merge pull request #1293 from acerix/1.8.3-dev
apply bitcoin patch for miniupnpc 1.9
-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;