diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-31 17:38:00 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-31 17:38:07 +0200 |
| commit | af9305a7e8a40014508fb66a22ae95e8afe142c6 (patch) | |
| tree | a9e112f54f6db66537e90ba35c38edd2678ab588 | |
| parent | f4d88c404136b410c41be936f26e8cb4e68589ca (diff) | |
| parent | 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (diff) | |
| download | bitcoin-af9305a7e8a40014508fb66a22ae95e8afe142c6.tar.xz | |
Merge pull request #6583
9f3e48e add support for miniupnpc api version 14 (Pavel Vasin)
| -rw-r--r-- | src/net.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp index b61f7325a9..105ccce848 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1120,10 +1120,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; |