[GNUnet-SVN] r15927 - gnunet/src/nat

[gnunet]

Author: grothoff
Date: 2011-07-11 16:54:27 +0200 (Mon, 11 Jul 2011)
New Revision: 15927

Modified:
   gnunet/src/nat/gnunet-nat-server.c
   gnunet/src/nat/nat.c
   gnunet/src/nat/test_nat.c
   gnunet/src/nat/test_nat_mini.c
   gnunet/src/nat/test_nat_test_data.conf
Log:
fixes

Modified: gnunet/src/nat/gnunet-nat-server.c
===================================================================
--- gnunet/src/nat/gnunet-nat-server.c  2011-07-11 14:49:46 UTC (rev 15926)
+++ gnunet/src/nat/gnunet-nat-server.c  2011-07-11 14:54:27 UTC (rev 15927)
@@ -29,6 +29,8 @@
 #include "gnunet_protocols.h"
 #include "nat.h"
 
+#define DEBUG_NAT GNUNET_NO
+
 /**
  * Our server.
  */
@@ -56,10 +58,12 @@
   struct GNUNET_NAT_Handle *h;
   struct sockaddr_in sa;
 
+#if DEBUG_NAT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Asking for connection reversal with %x and code %u\n",
              (unsigned int) dst_ipv4,
              (unsigned int) dport);
+#endif
   h = GNUNET_NAT_register (cfg,
                           is_tcp,
                           dport,
@@ -111,7 +115,11 @@
                                    ctx->s)) )
     {
       if (-1 == GNUNET_NETWORK_socket_send (ctx->s, &ctx->data, sizeof 
(ctx->data)))
-       GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
+       {
+#if DEBUG_NAT
+         GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
+#endif
+       }
       GNUNET_NETWORK_socket_shutdown (ctx->s, SHUT_RDWR);
     }
   GNUNET_NETWORK_socket_close (ctx->s);
@@ -149,9 +157,11 @@
 #endif
   sa.sin_addr.s_addr = dst_ipv4; 
   sa.sin_port = htons (dport);
+#if DEBUG_NAT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Sending TCP message to `%s'\n",
              GNUNET_a2s ((struct sockaddr*) &sa, sizeof (sa)));
+#endif
   if ( (GNUNET_OK != 
        GNUNET_NETWORK_socket_connect (s, 
                                       (const struct sockaddr*) &sa, sizeof 
(sa))) &&
@@ -199,9 +209,11 @@
 #endif
   sa.sin_addr.s_addr = dst_ipv4; 
   sa.sin_port = htons (dport);
+#if DEBUG_NAT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Sending UDP packet to `%s'\n",
              GNUNET_a2s ((struct sockaddr*) &sa, sizeof (sa)));
+#endif
   if (-1 == GNUNET_NETWORK_socket_sendto (s, 
                                          &data, sizeof(data),
                                          (const struct sockaddr*) &sa, sizeof 
(sa)))
@@ -226,8 +238,10 @@
   const struct GNUNET_NAT_TestMessage *tm;
   uint16_t dport;
 
+#if DEBUG_NAT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Received test request\n");
+#endif
   tm = (const struct GNUNET_NAT_TestMessage*) msg;
   dport = ntohs (tm->dport);
   if (0 == dport)

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2011-07-11 14:49:46 UTC (rev 15926)
+++ gnunet/src/nat/nat.c        2011-07-11 14:54:27 UTC (rev 15927)
@@ -423,11 +423,13 @@
   GNUNET_CONTAINER_DLL_insert (h->lal_head,
                               h->lal_tail,
                               lal);
+#if DEBUG_NAT
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                   "nat",
                   "Adding address `%s' from source %d\n",
                   GNUNET_a2s (arg, arg_size),
                   src);
+#endif
   if (NULL != h->address_callback)
     h->address_callback (h->callback_cls,
                         GNUNET_YES,
@@ -1229,8 +1231,6 @@
   h->use_hostname = GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                                          "nat",
                                                          "USE_HOSTNAME");
-  if (h->use_localaddresses)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "USE LOCALADDR enabled!\n");
   h->disable_ipv6 = GNUNET_CONFIGURATION_get_value_yesno(cfg,
                                                         "nat", 
                                                         "DISABLEV6");

Modified: gnunet/src/nat/test_nat.c
===================================================================
--- gnunet/src/nat/test_nat.c   2011-07-11 14:49:46 UTC (rev 15926)
+++ gnunet/src/nat/test_nat.c   2011-07-11 14:54:27 UTC (rev 15927)
@@ -129,7 +129,6 @@
   struct addr_cls data;
   struct sockaddr *addr;
 
-  GNUNET_log_setup ("test-nat", "DEBUG", NULL);
   data.addr = NULL;
   GNUNET_OS_network_interfaces_list (process_if, &data);
   if (NULL == data.addr)

Modified: gnunet/src/nat/test_nat_mini.c
===================================================================
--- gnunet/src/nat/test_nat_mini.c      2011-07-11 14:49:46 UTC (rev 15926)
+++ gnunet/src/nat/test_nat_mini.c      2011-07-11 14:54:27 UTC (rev 15927)
@@ -82,7 +82,6 @@
 {
   struct GNUNET_NAT_MiniHandle *mini;
 
-  GNUNET_log_setup ("test-nat-mini", "DEBUG", NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Requesting NAT redirection for port %u...\n",
               PORT);

Modified: gnunet/src/nat/test_nat_test_data.conf
===================================================================
--- gnunet/src/nat/test_nat_test_data.conf      2011-07-11 14:49:46 UTC (rev 
15926)
+++ gnunet/src/nat/test_nat_test_data.conf      2011-07-11 14:54:27 UTC (rev 
15927)
@@ -40,4 +40,4 @@
 
 # Disable IPv6 support
 DISABLEV6 = YES
-x
+