[GNUnet-SVN] r12345 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2010-07-26 19:00:26 +0200 (Mon, 26 Jul 2010)
New Revision: 12345

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/test_plugin_transport.c
   gnunet/src/transport/transport.h
Log:
bugfix

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2010-07-26 17:00:18 UTC 
(rev 12344)
+++ gnunet/src/transport/gnunet-service-transport.c     2010-07-26 17:00:26 UTC 
(rev 12345)
@@ -43,7 +43,7 @@
 
 #define DEBUG_PING_PONG GNUNET_NO
 
-#define DEBUG_TRANSPORT_HELLO GNUNET_YES
+#define DEBUG_TRANSPORT_HELLO GNUNET_NO
 
 /**
  * Should we do some additional checks (to validate behavior

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2010-07-26 17:00:18 UTC (rev 
12344)
+++ gnunet/src/transport/plugin_transport_udp.c 2010-07-26 17:00:26 UTC (rev 
12345)
@@ -762,6 +762,8 @@
   int other_peer_natd;
   const struct IPv4UdpAddress *t4;
 
+  if (force_address == GNUNET_SYSERR)
+    return GNUNET_SYSERR;
   GNUNET_assert (NULL == session);
 
   other_peer_natd = GNUNET_NO;
@@ -1439,8 +1441,10 @@
       break;
     default:
 #if DEBUG_UDP
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                       _("Sending message type %d to transport!\n"), 
ntohs(currhdr->type));
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                      "udp",
+                       "Sending message type %d to transport!\n", 
+                      ntohs(currhdr->type));
 #endif
       plugin->env->receive (plugin->env->cls, sender, currhdr, 
UDP_DIRECT_DISTANCE, 
                            NULL, sender_addr, fromlen);

Modified: gnunet/src/transport/test_plugin_transport.c
===================================================================
--- gnunet/src/transport/test_plugin_transport.c        2010-07-26 17:00:18 UTC 
(rev 12344)
+++ gnunet/src/transport/test_plugin_transport.c        2010-07-26 17:00:26 UTC 
(rev 12345)
@@ -90,7 +90,6 @@
 static int ok;
 
 /**
- * Initialize Environment for this plugin
  */
 static void
 receive (void *cls,

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2010-07-26 17:00:18 UTC (rev 12344)
+++ gnunet/src/transport/transport.h    2010-07-26 17:00:26 UTC (rev 12345)
@@ -30,7 +30,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_NO
+#define DEBUG_TRANSPORT GNUNET_YES
 #define DEBUG_TRANSPORT_TIMEOUT GNUNET_NO
 #define DEBUG_TRANSPORT_DISCONNECT GNUNET_NO