From: Gavin Andresen <gavinandresen@gmail.com>
Date: Mon, 12 Dec 2011 19:32:48 +0000 (-0800)
Subject: Merge pull request #694 from luke-jr/restore_old_miniupnp_compat
X-Git-Tag: v0.4.0-unstable~226^2~6
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=ca287d66f2f12ae3006daef831fbf00a4723e46d;hp=189dbde9827667c8aaf9a25e9e99f0caaf709edb;p=novacoin.git

Merge pull request #694 from luke-jr/restore_old_miniupnp_compat

Restore compatibility with miniupnpc 1.5 (without breaking miniupnp 1.6)
---

diff --git a/src/net.cpp b/src/net.cpp
index 199fb40..e0ac2ab 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1132,11 +1132,17 @@ void ThreadMapPort2(void* parg)
     const char * rootdescurl = 0;
     const char * multicastif = 0;
     const char * minissdpdpath = 0;
-    int error = 0;
     struct UPNPDev * devlist = 0;
     char lanaddr[64];
 
+#ifndef UPNPDISCOVER_SUCCESS
+    /* miniupnpc 1.5 */
+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
+#else
+    /* miniupnpc 1.6 */
+    int error = 0;
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
+#endif
 
     struct UPNPUrls urls;
     struct IGDdatas data;
@@ -1148,8 +1154,15 @@ void ThreadMapPort2(void* parg)
         char intClient[16];
         char intPort[6];
         string strDesc = "Bitcoin " + FormatFullVersion();
+#ifndef UPNPDISCOVER_SUCCESS
+    /* miniupnpc 1.5 */
+        r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
+	                        port, port, lanaddr, strDesc.c_str(), "TCP", 0);
+#else
+    /* miniupnpc 1.6 */
         r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
 	                        port, port, lanaddr, strDesc.c_str(), "TCP", 0, "0");
+#endif
 
         if(r!=UPNPCOMMAND_SUCCESS)
             printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",