Merge pull request #6583

9f3e48e add support for miniupnpc api version 14 (Pavel Vasin)
This commit is contained in:
Wladimir J. van der Laan 2015-08-31 17:38:00 +02:00
commit af9305a7e8
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -1120,10 +1120,14 @@ void ThreadMapPort()
#ifndef UPNPDISCOVER_SUCCESS #ifndef UPNPDISCOVER_SUCCESS
/* miniupnpc 1.5 */ /* miniupnpc 1.5 */
devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
#else #elif MINIUPNPC_API_VERSION < 14
/* miniupnpc 1.6 */ /* miniupnpc 1.6 */
int error = 0; int error = 0;
devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); 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 #endif
struct UPNPUrls urls; struct UPNPUrls urls;