diff options
-rw-r--r-- | src/nat/gnunet-nat-server.c | 1 | ||||
-rw-r--r-- | src/nat/nat.c | 3 | ||||
-rw-r--r-- | src/nat/nat.h | 2 | ||||
-rw-r--r-- | src/nat/nat_mini.c | 1 | ||||
-rw-r--r-- | src/nat/nat_test.c | 3 | ||||
-rw-r--r-- | 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 @@ | |||
29 | #include "gnunet_protocols.h" | 29 | #include "gnunet_protocols.h" |
30 | #include "nat.h" | 30 | #include "nat.h" |
31 | 31 | ||
32 | #define DEBUG_NAT GNUNET_NO | ||
33 | 32 | ||
34 | /** | 33 | /** |
35 | * Our server. | 34 | * 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 @@ | |||
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | #include "gnunet_resolver_service.h" | 30 | #include "gnunet_resolver_service.h" |
31 | #include "gnunet_nat_lib.h" | 31 | #include "gnunet_nat_lib.h" |
32 | 32 | #include "nat.h" | |
33 | #define DEBUG_NAT GNUNET_NO | ||
34 | 33 | ||
35 | /** | 34 | /** |
36 | * How often do we scan for changes in our IP address from our local | 35 | * 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 @@ | |||
28 | #define NAT_H | 28 | #define NAT_H |
29 | #include "gnunet_util_lib.h" | 29 | #include "gnunet_util_lib.h" |
30 | 30 | ||
31 | #define DEBUG_NAT GNUNET_NO | ||
32 | |||
31 | /** | 33 | /** |
32 | * Request to test NAT traversal. | 34 | * Request to test NAT traversal. |
33 | */ | 35 | */ |
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 @@ | |||
28 | #include "gnunet_nat_lib.h" | 28 | #include "gnunet_nat_lib.h" |
29 | #include "nat.h" | 29 | #include "nat.h" |
30 | 30 | ||
31 | #define DEBUG_NAT GNUNET_NO | ||
32 | 31 | ||
33 | /** | 32 | /** |
34 | * How long do we give upnpc to create a mapping? | 33 | * 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) | |||
252 | #if DEBUG_NAT | 252 | #if DEBUG_NAT |
253 | else | 253 | else |
254 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, | 254 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, |
255 | "nat" "Received data mismatches expected value\n"); | 255 | "nat", |
256 | "Received data mismatches expected value\n"); | ||
256 | #endif | 257 | #endif |
257 | } | 258 | } |
258 | #if DEBUG_NAT | 259 | #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, | |||
858 | { | 858 | { |
859 | /* maybe refused / unsupported address, try next */ | 859 | /* maybe refused / unsupported address, try next */ |
860 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "connect"); | 860 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "connect"); |
861 | #if 0 | ||
862 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
863 | _("Failed to connect to `%s' (%p)\n"), | ||
864 | GNUNET_a2s (ap->addr, ap->addrlen), h); | ||
865 | #endif | ||
861 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ap->sock)); | 866 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ap->sock)); |
862 | GNUNET_free (ap); | 867 | GNUNET_free (ap); |
863 | return; | 868 | return; |