[vidalia-svn] r2576: Switch some printf statements to use Vidalia's logging and u (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-16 11:14:34 -0400 (Fri, 16 May 2008)
New Revision: 2576

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
   vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
Log:
 r311@thebe:  edmanm | 2008-05-16 11:11:47 -0400
 Switch some printf statements to use Vidalia's logging and use Qt's Q_OS_WIN32
 instead of WIN32.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r311] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-05-13 01:42:52 UTC (rev 2575)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-05-16 15:14:34 UTC (rev 2576)
@@ -18,7 +18,7 @@
 
 #include <QMutex>
 
-#ifdef WIN32
+#ifdef Q_OS_WIN32
 #include <winsock2.h>
 #endif
 
@@ -68,3 +68,4 @@
   mutex->unlock();
   controlThread->wakeup();
 }
+

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-05-13 01:42:52 UTC (rev 2575)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-05-16 15:14:34 UTC (rev 2576)
@@ -22,8 +22,9 @@
 #include <QTextStream>
 #include <QString>
 #include <QMessageBox>
+#include <vidalia.h>
 
-#ifdef WIN32
+#ifdef Q_OS_WIN32
 #include <winsock2.h>
 #endif
 
@@ -91,10 +92,7 @@
   bool force_init = false;
   int retval = 0;
 
-#ifdef UPNPCONTROL_DEBUG
-    printf("configurePorts()\n");
-    fflush(stdout);
-#endif
+  vDebug("configurePorts()");
 
   /* Get desired state */
   _control->getDesiredState(&desiredDirPort, &desiredOrPort);
@@ -135,16 +133,13 @@
       _orPort = desiredOrPort;
   }
 
-#ifdef UPNPCONTROL_DEBUG
-  printf("configurePorts() result %d\n", retval);
-    fflush(stdout);
-#endif
+  vInfo("configurePorts() result: %1").arg(retval);
     
-    if (retval) {
-      QString message;
-      QTextStream(&message) << "Failed to configure automatic port forwarding (status: " << retval << ")";
-      QMessageBox::warning(0, QString("Automatic port forwarding"), message);
-    }
+  if (retval) {
+    QString message;
+    QTextStream(&message) << "Failed to configure automatic port forwarding (status: " << retval << ")";
+    QMessageBox::warning(0, QString("Automatic port forwarding"), message);
+  }
 }
 
 void
@@ -177,14 +172,13 @@
 int
 UPNPControlThread::updatePort(quint16 oldPort, quint16 newPort)
 {
-
   int retval;
 
-#ifdef WIN32  
+#ifdef Q_OS_WIN32  
   // Workaround from http://trolltech.com/developer/knowledgebase/579
   WSAData wsadata;
   if (WSAStartup(MAKEWORD(2,0), &wsadata)!=0) {
-    qFatal("WSAStartup failure while disabling UPnP port forwarding");
+    vWarn("WSAStartup failure while disabling UPnP port forwarding");
   }
 #endif
 
@@ -204,7 +198,7 @@
   if (!retval && newPort != 0)
     retval = forwardPort(newPort);
 
-#ifdef WIN32
+#ifdef Q_OS_WIN32
   WSACleanup();
 #endif
 
@@ -223,19 +217,13 @@
 
   devlist = upnpDiscover(2000, NULL, NULL);
   if (NULL == devlist) {
-#ifdef UPNPCONTROL_DEBUG
-    printf("upnpDiscover returned: NULL\n");
-    fflush(stdout);
-#endif
+    vWarn("upnpDiscover returned: NULL");
     return 5;
   }
 
   retval = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
 
-  #ifdef UPNPCONTROL_DEBUG
-  printf("GetValidIGD returned: %d\n", retval);
-  fflush(stdout);
-  #endif
+  vInfo("GetValidIGD returned: %1").arg(retval);
 
   freeUPNPDevlist(devlist);
 
@@ -262,11 +250,8 @@
   retval = UPNP_AddPortMapping(urls.controlURL, data.servicetype,
                                sPort, sPort, lanaddr, "Tor server", "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
-    #ifdef UPNPCONTROL_DEBUG
-    printf("AddPortMapping(%s, %s, %s) failed with code %d\n",
-           sPort, sPort, lanaddr, retval);
-    fflush(stdout);
-    #endif
+    vWarn("AddPortMapping(%1, %2, %3) failed with code %4")
+            .arg(sPort).arg(sPort).arg(lanaddr).arg(retval);
     return 1;
   }
   
@@ -274,26 +259,17 @@
   retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.servicetype,
                                             sPort, "TCP", intClient, intPort);
   if(UPNPCOMMAND_SUCCESS != retval) {
-    #ifdef UPNPCONTROL_DEBUG
-    printf("GetSpecificPortMappingEntry() failed with code %d\n", retval);
-    fflush(stdout);
-    #endif
+    vWarn("GetSpecificPortMappingEntry() failed with code %1").arg(retval);
     return 2;
   }
   
   if(! intClient[0]) {
-    #ifdef UPNPCONTROL_DEBUG
-    printf("GetSpecificPortMappingEntry failed.\n");
-    fflush(stdout);
-    #endif
+    vWarn("GetSpecificPortMappingEntry failed.");
     return 3;
   }
   
   // Output the mapping
-  #ifdef UPNPCONTROL_DEBUG
-  printf("(external):%s -> %s:%s\n", sPort, intClient, intPort);
-  fflush(stdout);
-  #endif
+  vInfo("(external):%1 -> %2:%3").arg(sPort).arg(intClient).arg(intPort);
 
   return 0;
 }
@@ -310,18 +286,13 @@
   int retval = UPNP_DeletePortMapping(urls.controlURL, data.servicetype,
                                       sPort, "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
-#ifdef UPNPCONTROL_DEBUG
-    printf("DeletePortMapping() failed with code %d\n", retval);
-    fflush(stdout);
-#endif
+    vWarn("DeletePortMapping() failed with code %1").arg(retval);
     return 4;
   }
   
   // Output the cancelled mapping
-#ifdef UPNPCONTROL_DEBUG
-  printf("(external):%s -> <>\n", sPort);
-  fflush(stdout);
-#endif
+  vInfo("(external):%1 -> <>").arg(sPort);
   
   return 0;
 }
+