dbg support:

diff --git a/src/nat/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c
index bb637235de484fd1df00dbe1137f29b4a6125eb1..4b7e31ef86fd1ee7aff730264d0bb16ce4709d97 100644 (file)
--- a/src/nat/gnunet-nat-server.c
+++ b/src/nat/gnunet-nat-server.c
@@ -29,7 +29,6 @@
 #include "gnunet_protocols.h"
 #include "nat.h"
 
-#define DEBUG_NAT GNUNET_NO
 
 /**
  * Our server.

diff --git a/src/nat/nat.c b/src/nat/nat.c
index 0eadf5337f98bf4309f9336df00c328a5c2d668b..fc20fe54d25f7d2bfcdbed7ab6de0b9c6b718318 100644 (file)
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -29,8 +29,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_nat_lib.h"
-
-#define DEBUG_NAT GNUNET_NO
+#include "nat.h"
 
 /**
  * How often do we scan for changes in our IP address from our local

diff --git a/src/nat/nat.h b/src/nat/nat.h
index bb13e527497d85e8f4bff75f983f1884a0c1de24..dbb5263d4f6856273c9b48ff82f5b31a8638e088 100644 (file)
--- a/src/nat/nat.h
+++ b/src/nat/nat.h
@@ -28,6 +28,8 @@
 #define NAT_H
 #include "gnunet_util_lib.h"
 
+#define DEBUG_NAT GNUNET_NO
+
 /**
  * Request to test NAT traversal.
  */

diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index 52a4e86b0ccb666df9d1a15014351ca40ddad66a..ccdc832658d406228eb8245f8ea2cca56c2f0b3a 100644 (file)
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -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?

diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index 74bb758dd3ad385fd46e7c86fa7dd8b3b8df5258..a524831e4e32d65b918aec86c64a10b46c3232a3 100644 (file)
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -252,7 +252,8 @@ do_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #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

diff --git a/src/util/connection.c b/src/util/connection.c
index 2c32923c2ff2d2b4c33db6a08c734adc232e8649..00f35dc81ed513c2ba03ffec58a6a9a6a905f148 100644 (file)
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -858,6 +858,11 @@ try_connect_using_address (void *cls, const struct sockaddr *addr,
   {
     /* 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;