diff options
| author | Ross Nicoll <[email protected]> | 2015-10-10 16:14:26 +0000 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2015-10-10 16:14:26 +0000 |
| commit | 212b31616c9ca262a5cbf55aea993549efab71a0 (patch) | |
| tree | cf109ada676093a4ef9c71e227c2dfa7e67d19ce | |
| parent | Merge pull request #1270 from rnicoll/1.10-fixmes (diff) | |
| download | discoin-212b31616c9ca262a5cbf55aea993549efab71a0.tar.xz discoin-212b31616c9ca262a5cbf55aea993549efab71a0.zip | |
Merge in miniupnpc updates from Bitcoin Core
Contains:
0cca0248f030ea32bd8de778b5a2782e0d191978
9f3e48e5219a09b5ddfd6883d1f0498910eff4b6
888c595cffe73b0d49434acf49a9611cbff1ea1d
00c5a73136e13813219c7b0846fa1bfd91757e5d
| -rw-r--r-- | depends/packages/miniupnpc.mk | 4 | ||||
| -rw-r--r-- | src/net.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk index 00101f1b9..77bae10c7 100644 --- a/depends/packages/miniupnpc.mk +++ b/depends/packages/miniupnpc.mk @@ -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)" 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; |