Permalink
Browse files

Merge in miniupnpc updates from Bitcoin Core

  • Loading branch information...
1 parent 22c4028 commit 212b31616c9ca262a5cbf55aea993549efab71a0 @rnicoll rnicoll committed Oct 10, 2015
Showing with 7 additions and 3 deletions.
  1. +2 −2 depends/packages/miniupnpc.mk
  2. +5 −1 src/net.cpp
@@ -1,8 +1,8 @@
package=miniupnpc
-$(package)_version=1.9.20140701
+$(package)_version=1.9.20151008
$(package)_download_path=http://miniupnp.free.fr/files
$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07
+$(package)_sha256_hash=e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633
define $(package)_set_vars
$(package)_build_opts=CC="$($(package)_cc)"
View
@@ -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;

0 comments on commit 212b316

Please sign in to comment.