[vidalia-svn] r3238: Merge r3235-r3237 to the auto-updates branch. (vidalia/branches/auto-updates/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-10-18 23:03:42 -0400 (Sat, 18 Oct 2008)
New Revision: 3238

Modified:
   vidalia/branches/auto-updates/src/vidalia/config/servicesettings.cpp
   vidalia/branches/auto-updates/src/vidalia/config/upnpcontrolthread.cpp
Log:
Merge r3235-r3237 to the auto-updates branch.


Modified: vidalia/branches/auto-updates/src/vidalia/config/servicesettings.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/servicesettings.cpp	2008-10-19 02:41:45 UTC (rev 3237)
+++ vidalia/branches/auto-updates/src/vidalia/config/servicesettings.cpp	2008-10-19 03:03:42 UTC (rev 3238)
@@ -71,9 +71,9 @@
     if(enabledS.compare("x1") == 0) {
       enabled = true;
     }
-    Service s(address, virtualPort, physAddrPort, serviceDir, enabled);
-    s.setAdditionalServiceOptions(additionalData);
-    services.addService(s);
+    Service service(address, virtualPort, physAddrPort, serviceDir, enabled);
+    service.setAdditionalServiceOptions(additionalData);
+    services.addService(service);
   }
   return services;
 }

Modified: vidalia/branches/auto-updates/src/vidalia/config/upnpcontrolthread.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/upnpcontrolthread.cpp	2008-10-19 02:41:45 UTC (rev 3237)
+++ vidalia/branches/auto-updates/src/vidalia/config/upnpcontrolthread.cpp	2008-10-19 03:03:42 UTC (rev 3238)
@@ -24,10 +24,6 @@
 #include <QMessageBox>
 #include <vidalia.h>
 
-#ifdef Q_OS_WIN32
-#include <winsock2.h>
-#endif
-
 #include "upnpcontrol.h"
 
 #define UPNPCONTROL_REINIT_MSEC 300000 // 5 minutes
@@ -274,19 +270,19 @@
 UPNPControl::UPNPError
 UPNPControlThread::forwardPort(quint16 port)
 {
+  QString sPort;
   int retval;
 
-  char sPort[6];
-
   char intClient[16];
   char intPort[6];
 
   // Convert the port number to a string
-  snprintf(sPort, sizeof(sPort), "%d", port);
+  sPort = QString::number(port);
 
   // Add the port mapping of external:port -> internal:port
   retval = UPNP_AddPortMapping(urls.controlURL, data.servicetype,
-                               sPort, sPort, lanaddr, "Tor relay", "TCP");
+                               qPrintable(sPort), qPrintable(sPort), lanaddr,
+                               "Tor relay", "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
     vWarn("AddPortMapping(%1, %2, %3) failed with code %4")
             .arg(sPort).arg(sPort).arg(lanaddr).arg(retval);
@@ -295,7 +291,8 @@
 
   // Check if the port mapping was accepted
   retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.servicetype,
-                                            sPort, "TCP", intClient, intPort);
+                                            qPrintable(sPort), "TCP",
+                                            intClient, intPort);
   if(UPNPCOMMAND_SUCCESS != retval) {
     vWarn("GetSpecificPortMappingEntry() failed with code %1").arg(retval);
     return UPNPControl::GetPortMappingFailed;
@@ -317,14 +314,11 @@
 UPNPControl::UPNPError
 UPNPControlThread::disablePort(quint16 port)
 {
-  char sPort[6];
+  QString sPort = QString::number(port);
 
-  // Convert the port number to a string
-  snprintf(sPort, sizeof(sPort), "%d", port);
-
   // Remove the mapping
   int retval = UPNP_DeletePortMapping(urls.controlURL, data.servicetype,
-                                      sPort, "TCP");
+                                      qPrintable(sPort), "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
     vWarn("DeletePortMapping() failed with code %1").arg(retval);
     return UPNPControl::DeletePortMappingFailed;