[vidalia-svn] r4252: Update UPNPControlThread to support the newest miniupnpc API (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-04-09 19:18:46 -0400 (Fri, 09 Apr 2010)
New Revision: 4252

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/config/UPNPControlThread.cpp
Log:

Update UPNPControlThread to support the newest miniupnpc API and give it a
changelog item.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2010-04-09 23:17:13 UTC (rev 4251)
+++ vidalia/trunk/CHANGELOG	2010-04-09 23:18:46 UTC (rev 4252)
@@ -10,6 +10,7 @@
     loading the libraries twice and crashing.
   o Include libgcc_s_dw2-1.dll in the Windows installers, since Qt 4.6 now
     depends on that DLL. (Ticket #555)
+  o Update the included version of miniupnpc to 1.4.20100407.
   o Add Burmese and Thai UI translations.
 
 

Modified: vidalia/trunk/src/vidalia/config/UPNPControlThread.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/UPNPControlThread.cpp	2010-04-09 23:17:13 UTC (rev 4251)
+++ vidalia/trunk/src/vidalia/config/UPNPControlThread.cpp	2010-04-09 23:18:46 UTC (rev 4252)
@@ -280,7 +280,7 @@
   sPort = QString::number(port);
 
   // Add the port mapping of external:port -> internal:port
-  retval = UPNP_AddPortMapping(urls.controlURL, data.servicetype,
+  retval = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
                                qPrintable(sPort), qPrintable(sPort), lanaddr,
                                "Tor relay", "TCP", NULL);
   if(UPNPCOMMAND_SUCCESS != retval) {
@@ -290,7 +290,7 @@
   }
 
   // Check if the port mapping was accepted
-  retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.servicetype,
+  retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.first.servicetype,
                                             qPrintable(sPort), "TCP",
                                             intClient, intPort);
   if(UPNPCOMMAND_SUCCESS != retval) {
@@ -317,7 +317,7 @@
   QString sPort = QString::number(port);
 
   // Remove the mapping
-  int retval = UPNP_DeletePortMapping(urls.controlURL, data.servicetype,
+  int retval = UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype,
                                       qPrintable(sPort), "TCP", NULL);
   if(UPNPCOMMAND_SUCCESS != retval) {
     vWarn("DeletePortMapping() failed with code %1").arg(retval);