[GNUnet-SVN] r16863 - in gnunet/src: nat util

[gnunet]

Author: grothoff
Date: 2011-09-15 14:47:43 +0200 (Thu, 15 Sep 2011)
New Revision: 16863

Modified:
   gnunet/src/nat/gnunet-nat-server.c
   gnunet/src/nat/nat.c
   gnunet/src/nat/nat.h
   gnunet/src/nat/nat_mini.c
   gnunet/src/nat/nat_test.c
   gnunet/src/util/connection.c
Log:
dbg support:


Modified: gnunet/src/nat/gnunet-nat-server.c
===================================================================
--- gnunet/src/nat/gnunet-nat-server.c  2011-09-15 12:31:32 UTC (rev 16862)
+++ gnunet/src/nat/gnunet-nat-server.c  2011-09-15 12:47:43 UTC (rev 16863)
@@ -29,7 +29,6 @@
 #include "gnunet_protocols.h"
 #include "nat.h"
 
-#define DEBUG_NAT GNUNET_NO
 
 /**
  * Our server.

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2011-09-15 12:31:32 UTC (rev 16862)
+++ gnunet/src/nat/nat.c        2011-09-15 12:47:43 UTC (rev 16863)
@@ -29,9 +29,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_nat_lib.h"
+#include "nat.h"
 
-#define DEBUG_NAT GNUNET_NO
-
 /**
  * How often do we scan for changes in our IP address from our local
  * interfaces?

Modified: gnunet/src/nat/nat.h
===================================================================
--- gnunet/src/nat/nat.h        2011-09-15 12:31:32 UTC (rev 16862)
+++ gnunet/src/nat/nat.h        2011-09-15 12:47:43 UTC (rev 16863)
@@ -28,6 +28,8 @@
 #define NAT_H
 #include "gnunet_util_lib.h"
 
+#define DEBUG_NAT GNUNET_NO
+
 /**
  * Request to test NAT traversal.
  */

Modified: gnunet/src/nat/nat_mini.c
===================================================================
--- gnunet/src/nat/nat_mini.c   2011-09-15 12:31:32 UTC (rev 16862)
+++ gnunet/src/nat/nat_mini.c   2011-09-15 12:47:43 UTC (rev 16863)
@@ -28,7 +28,6 @@
 #include "gnunet_nat_lib.h"
 #include "nat.h"
 
-#define DEBUG_NAT GNUNET_NO
 
 /**
  * How long do we give upnpc to create a mapping?

Modified: gnunet/src/nat/nat_test.c
===================================================================
--- gnunet/src/nat/nat_test.c   2011-09-15 12:31:32 UTC (rev 16862)
+++ gnunet/src/nat/nat_test.c   2011-09-15 12:47:43 UTC (rev 16863)
@@ -252,7 +252,8 @@
 #if DEBUG_NAT
     else
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                       "nat" "Received data mismatches expected value\n");
+                       "nat",
+                      "Received data mismatches expected value\n");
 #endif
   }
 #if DEBUG_NAT

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2011-09-15 12:31:32 UTC (rev 16862)
+++ gnunet/src/util/connection.c        2011-09-15 12:47:43 UTC (rev 16863)
@@ -858,6 +858,11 @@
   {
     /* maybe refused / unsupported address, try next */
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "connect");
+#if 0
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+               _("Failed to connect to `%s' (%p)\n"),
+               GNUNET_a2s (ap->addr, ap->addrlen), h);
+#endif
     GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ap->sock));
     GNUNET_free (ap);
     return;