4 files changed, 8 insertions, 5 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index c1dc60fd0..eda1fec7e 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -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
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 5dbb94bcb..5b5aaf882 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -762,6 +762,8 @@ udp_plugin_send (void *cls,
   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 @@ udp_demultiplexer(struct Plugin *plugin, struct GNUNET_PeerIdentity *sender,
       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);
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index ccaefd042..aee4901db 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -90,7 +90,6 @@ struct GNUNET_TRANSPORT_PluginFunctions *api;
 static int ok;
 
 /**
- * Initialize Environment for this plugin
  */
 static void
 receive (void *cls,
diff --git a/src/transport/transport.h b/src/transport/transport.h
index aa934c944..d73e17cdc 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -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