From 00a7f964e0696b80455fa8e0d217f29762f490c1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 15 Sep 2011 12:47:43 +0000 Subject: [PATCH] dbg support: --- src/nat/gnunet-nat-server.c | 1 - src/nat/nat.c | 3 +-- src/nat/nat.h | 2 ++ src/nat/nat_mini.c | 1 - src/nat/nat_test.c | 3 ++- src/util/connection.c | 5 +++++ 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/nat/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c index bb637235d..4b7e31ef8 100644 --- 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 0eadf5337..fc20fe54d 100644 --- 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 bb13e5274..dbb5263d4 100644 --- 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 52a4e86b0..ccdc83265 100644 --- 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 74bb758dd..a524831e4 100644 --- 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 2c32923c2..00f35dc81 100644 --- 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; -- 2.25.1