[vidalia-svn] r2532: Allow debugging printf() statements to be disabled with a #d (vidalia/branches/upnp/src/vidalia/config)

[sjmurdoch@xxxxxxxxxxxxxxxxxxx]

Author: sjmurdoch
Date: 2008-04-24 10:27:03 -0400 (Thu, 24 Apr 2008)
New Revision: 2532

Modified:
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
Log:
Allow debugging printf() statements to be disabled with a #define

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-04-22 03:42:35 UTC (rev 2531)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-04-24 14:27:03 UTC (rev 2532)
@@ -16,6 +16,8 @@
 
 #include "upnpcontrol.h"
 
+#define UPNPCONTROL_DEBUG 1
+
 UPNPControl* UPNPControl::pInstance = 0;
 UPNPControl* UPNPControl::Instance()
 {
@@ -47,8 +49,11 @@
   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
     return 1;
   }
   
@@ -58,18 +63,26 @@
 					    sPort, "TCP",
 					    intClient, intPort);
   if(UPNPCOMMAND_SUCCESS != retval) {
+    #ifdef UPNPCONTROL_DEBUG
     printf("GetSpecificPortMappingEntry() failed with code %d\n", retval);
+    fflush(stdout);
+    #endif
     return 2;
   }
   
   if(! intClient[0]) {
+    #ifdef UPNPCONTROL_DEBUG
     printf("GetSpecificPortMappingEntry failed.\n");
+    fflush(stdout);
+    #endif
     return 3;
   }
   
   // Output the mapping
+  #ifdef UPNPCONTROL_DEBUG
   printf("(external):%s -> %s:%s\n", sPort, intClient, intPort);
   fflush(stdout);
+  #endif
 
   // Save the mapping
   forwardedPort = port;
@@ -90,13 +103,18 @@
 
   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
     return 1;
   }
 
   // Output the cancelled mapping
+  #ifdef UPNPCONTROL_DEBUG
   printf("(external):%s -> <>\n", sPort);
   fflush(stdout);
+  #endif
 
   // Save the mapping
   forwardedPort = 0;
@@ -117,8 +135,11 @@
 
   devlist = upnpDiscover(2000, NULL, NULL);
   retval = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
+
+  #ifdef UPNPCONTROL_DEBUG
   printf("GetValidIGD returned: %d\n", retval);
   fflush(stdout);
+  #endif
 
   freeUPNPDevlist(devlist);
 }