add support for miniupnpc 2.0

fflo · Jun 3, 2017 · 53b5955 · 53b5955
1 parent 853a040
commit 53b5955
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/611-qt.pro b/611-qt.pro
@@ -329,7 +329,7 @@ QMAKE_EXTRA_COMPILERS += TSQM
 
 # platform specific defaults, if not overridden on command line
 isEmpty(BOOST_LIB_SUFFIX) {
-    # macx:BOOST_LIB_SUFFIX = -mt
+    macx:BOOST_LIB_SUFFIX = -mt
     win32:BOOST_LIB_SUFFIX = -mgw49-mt-s-1_59
 }
 
@@ -350,8 +350,8 @@ isEmpty(BDB_INCLUDE_PATH) {
 }
 
 # compile workaround mac os x
-macx:BOOST_LIB_PATH = /opt/boost-159/lib
-macx:BOOST_INCLUDE_PATH = /opt/boost-159/include
+#macx:BOOST_LIB_PATH = /opt/boost-159/lib
+#macx:BOOST_INCLUDE_PATH = /opt/boost-159/include
 
 isEmpty(BOOST_LIB_PATH) {
     macx:BOOST_LIB_PATH = /opt/local/lib

diff --git a/src/net.cpp b/src/net.cpp
@@ -1117,10 +1117,14 @@ void ThreadMapPort2(void* parg)
 #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;