14 files changed, 156 insertions, 110 deletions

diff --git a/src/core/core.h b/src/core/core.h
index 840c7e143..9f520bf40 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -26,7 +26,7 @@
 #include "gnunet_crypto_lib.h"
 #include "gnunet_time_lib.h"
 
-#define DEBUG_CORE GNUNET_NO
+#define DEBUG_CORE GNUNET_YES
 
 /**
  * Definition of bits in the InitMessage's options field that specify
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 2fbb4ca05..44df8a867 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1606,6 +1606,8 @@ send_connect_continuation (void *cls, size_t size, void *buf)
                   "Asked to send message to disconnected peer `%4s' and connection failed.  Discarding message.\n",
                   GNUNET_i2s (&sm->peer));
       GNUNET_free (sm);
+      /* FIXME: do we need to do something here to let the
+         client know about the failure!? */
       return 0;
     }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1659,8 +1661,9 @@ handle_client_send (void *cls,
   if (n == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Not yet connected to `%4s', will try to establish connection\n",
-                  GNUNET_i2s (&sm->peer));
+                  "Not yet connected to `%4s', will try to establish connection within %llu ms\n",
+                  GNUNET_i2s (&sm->peer),
+                  sm->deadline.value);
       msize += sizeof (struct SendMessage);
       /* ask transport to connect to the peer */
       /* FIXME: this code does not handle the
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index e1b3dcd0d..1151f3ebb 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -34,7 +34,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define START_ARM GNUNET_YES
 
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index fb060e3e6..3c7020688 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -9,9 +9,9 @@ PORT = 12464
 [transport]
 PORT = 12465
 PLUGINS = tcp
-#PREFIX = xterm -T transport1 -e
+PREFIX = xterm -T transport1 -e
 #PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
-#DEBUG = YES
+DEBUG = YES
 
 [arm]
 PORT = 12466
@@ -33,8 +33,8 @@ PORT = 12469
 PORT = 12470
 #PREFIX = xterm -T core1 -e valgrind --tool=memcheck
 #PREFIX = xterm -T core1 -e gdb -x cmd --args
-#PREFIX = xterm -T core1 -e 
-#DEBUG = YES
+PREFIX = xterm -T core1 -e 
+DEBUG = YES
 
 [testing]
 WEAKRANDOM = YES
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index e3862da0f..2e994d27a 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -9,9 +9,9 @@ PORT = 22464
 [transport]
 PORT = 22465
 PLUGINS = tcp
-#PREFIX = xterm -T transport2 -e
+PREFIX = xterm -T transport2 -e
 #PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
-#DEBUG = YES
+DEBUG = YES
 
 [arm]
 PORT = 22466
@@ -31,9 +31,9 @@ PORT = 22469
 
 [core]
 PORT = 22470
-#PREFIX = xterm -T core2 -e
+PREFIX = xterm -T core2 -e
 #PREFIX = xterm -T core2 -e valgrind --tool=memcheck
-#DEBUG = YES
+DEBUG = YES
 
 [testing]
 WEAKRANDOM = YES
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 61b572eb8..afc9b0bcb 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -217,6 +217,20 @@ void GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
  */
 const char *GNUNET_i2s (const struct GNUNET_PeerIdentity *pid);
 
+
+/**
+ * Convert a "struct sockaddr*" (IPv4 or IPv6 address) to a string
+ * (for printing debug messages).  This is one of the very few calls
+ * in the entire API that is NOT reentrant!
+ *
+ * @param addr the address
+ * @param addrlen the length of the address
+ * @return nicely formatted string for the address
+ *  will be overwritten by next call to GNUNET_a2s.
+ */
+const char *GNUNET_a2s (const struct sockaddr *addr,
+                        socklen_t addrlen);
+
 /**
  * Convert error type to string.
  *
diff --git a/src/resolver/test_resolver_api.c b/src/resolver/test_resolver_api.c
index 240879d73..cadd52e0c 100644
--- a/src/resolver/test_resolver_api.c
+++ b/src/resolver/test_resolver_api.c
@@ -44,26 +44,9 @@ check_hostname (void *cls, const struct sockaddr *sa, socklen_t salen)
       (*ok) &= ~8;
       return;
     }
-  if (salen == sizeof (struct sockaddr_in))
-    {
-      struct sockaddr_in *in = (struct sockaddr_in *) sa;
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Got IP address `%s' for our host.\n"),
-                  inet_ntop (AF_INET, &in->sin_addr, buf, sizeof (buf)));
-    }
-  else if (salen == sizeof (struct sockaddr_in6))
-    {
-      struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) sa;
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  _("Got IP address `%s' for our host.\n"),
-                  inet_ntop (AF_INET6, &in6->sin6_addr, buf, sizeof (buf)));
-    }
-  else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _("Got address of bogus length %u\n"), salen);
-      GNUNET_assert (0);
-    }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              _("Got IP address `%s' for our host.\n"),
+              GNUNET_a2s (sa, salen));
 }
 
 
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index c44d5ef04..18b50b38a 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -753,6 +753,8 @@ transmit_to_client_callback (void *cls, size_t size, void *buf)
 
   if (buf == NULL)
     {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Transmission to client failed, closing connection.\n");
       /* fatal error with client, free message queue! */
       while (NULL != (q = client->message_queue_head))
         {
@@ -927,9 +929,15 @@ transmit_send_continuation (void *cls,
       GNUNET_assert (rl != NULL);
     }
   if (result == GNUNET_OK)
-    rl->timeout = GNUNET_TIME_relative_to_absolute (IDLE_CONNECTION_TIMEOUT);
+    {
+      rl->timeout = GNUNET_TIME_relative_to_absolute (IDLE_CONNECTION_TIMEOUT);
+    }
   else
-    rl->connected = GNUNET_NO;
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Transmission failed, marking connection as down.\n");
+      rl->connected = GNUNET_NO;
+    }
   if (!mq->internal_msg)
     rl->transmit_ready = GNUNET_YES;
   if (mq->client != NULL)
@@ -1389,7 +1397,8 @@ plugin_env_notify_address (void *cls,
 
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Plugin `%s' informs us about a new address\n", name);
+              "Plugin `%s' informs us about a new address `%s'\n", name,
+              GNUNET_a2s(addr, addrlen));
 #endif
   abex = GNUNET_TIME_relative_to_absolute (expires);
   GNUNET_assert (p == find_transport (name));
@@ -1618,7 +1627,7 @@ cleanup_validation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
           else
             pos = prev->next;
           continue;
-        }
+        }
       prev = pos;
       pos = pos->next;
     }
@@ -1654,6 +1663,7 @@ struct CheckHelloValidatedContext
    * Validation list being build.
    */
   struct ValidationList *e;
+
 };
 
 
@@ -1671,6 +1681,7 @@ run_validation (void *cls,
   struct TransportPlugin *tp;
   struct ValidationAddress *va;
   struct ValidationChallengeMessage *vcm;
+  struct GNUNET_PeerIdentity id;
 
   tp = find_transport (tname);
   if (tp == NULL)
@@ -1682,6 +1693,16 @@ run_validation (void *cls,
                   tname);
       return GNUNET_OK;
     }
+  GNUNET_CRYPTO_hash (&e->publicKey,
+                      sizeof (struct
+                              GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                      &id.hashPubKey);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Scheduling validation of address `%s' via `%s' for `%4s'\n",
+              GNUNET_a2s(addr, addrlen),
+              tname,
+              GNUNET_i2s(&id));
+
   va = GNUNET_malloc (sizeof (struct ValidationAddress) +
                       sizeof (struct ValidationChallengeMessage) + addrlen);
   va->next = e->addresses;
@@ -1699,7 +1720,7 @@ run_validation (void *cls,
   vcm->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_HELLO);
   vcm->challenge = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
                                              (unsigned int) -1);
-  /* Note: vcm->target is set in check_hello_validated */
+  vcm->target = id;
   memcpy (&vcm[1], addr, addrlen);
   return GNUNET_OK;
 }
@@ -1752,10 +1773,6 @@ check_hello_validated (void *cls,
   va = chvc->e->addresses;
   while (va != NULL)
     {
-      GNUNET_CRYPTO_hash (&chvc->e->publicKey,
-                          sizeof (struct
-                                  GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
-                          &va->msg->target.hashPubKey);
 #if DEBUG_TRANSPORT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Establishing `%s' connection to validate `%s' of `%4s' (sending our `%s')\n",
@@ -1841,6 +1858,11 @@ process_hello (struct TransportPlugin *plugin,
                                GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))
         {
           /* TODO: call to stats? */
+#if DEBUG_TRANSPORT
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "`%s' message for peer `%4s' is already pending; ignoring new message\n",
+                      "HELLO", GNUNET_i2s (&target));
+#endif    
           return GNUNET_OK;
         }
       e = e->next;
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 6ebb257a1..4ab555ad6 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -38,7 +38,7 @@
 #include "plugin_transport.h"
 #include "transport.h"
 
-#define DEBUG_TCP GNUNET_NO
+#define DEBUG_TCP GNUNET_YES
 
 /**
  * After how long do we expire an address that we
@@ -440,8 +440,6 @@ connect_and_create_session (struct Plugin *plugin,
   struct GNUNET_NETWORK_SocketHandle *conn;
   struct Session *session;
   int af;
-  char buf[INET6_ADDRSTRLEN];
-  uint16_t port;
 
   session = plugin->sessions;
   while (session != NULL)
@@ -456,20 +454,9 @@ connect_and_create_session (struct Plugin *plugin,
     }
 
   if (addrlen == sizeof (struct sockaddr_in))
-    {
-      af = AF_INET;
-      inet_ntop (af,
-                 &((struct sockaddr_in *) addr)->sin_addr, buf, sizeof (buf));
-      port = ntohs (((struct sockaddr_in *) addr)->sin_port);
-    }
+    af = AF_INET;
   else if (addrlen == sizeof (struct sockaddr_in6))
-    {
-      af = AF_INET6;
-      inet_ntop (af,
-                 &((struct sockaddr_in6 *) addr)->sin6_addr,
-                 buf, sizeof (buf));
-      port = ntohs (((struct sockaddr_in6 *) addr)->sin6_port);
-    }
+    af = AF_INET6;    
   else
     {
       GNUNET_break_op (0);
@@ -485,8 +472,8 @@ connect_and_create_session (struct Plugin *plugin,
 #if DEBUG_TCP
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                        "tcp",
-                       "Failed to create connection to peer at `%s:%u'.\n",
-                       buf, port);
+                       "Failed to create connection to peer at `%s'.\n",
+                       GNUNET_a2s(addr, addrlen));
 #endif
       return NULL;
     }
@@ -499,8 +486,10 @@ connect_and_create_session (struct Plugin *plugin,
 #if DEBUG_TCP
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                    "tcp",
-                   "Creating new session %p with `%s:%u' based on `%s' request.\n",
-                   session, buf, port, "send_to");
+                   "Creating new session %p with `%s' based on `%s' request.\n",
+                   session, 
+                   GNUNET_a2s(addr, addrlen),
+                   "send_to");
 #endif
   return session;
 }
@@ -541,7 +530,9 @@ do_transmit (void *cls, size_t size, void *buf)
     {
 #if DEBUG_TCP
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                       "tcp", "Timeout trying to transmit\n");
+                       "tcp", 
+                       "Timeout trying to transmit to peer `%4s', discarding message queue.\n",
+                       GNUNET_i2s(&session->target));
 #endif
       /* timeout */
       while (NULL != (pm = session->pending_messages))
@@ -1095,7 +1086,11 @@ tcp_plugin_cancel (void *cls,
   struct PendingMessage *pm;
   struct Session *session;
   struct Session *next;
-
+  
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                   "tcp",
+                   "Asked to close session with `%4s'\n",
+                   GNUNET_i2s(target));
   session = plugin->sessions;
   while (session != NULL)
     {
@@ -1315,8 +1310,6 @@ tcp_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
   char buf[sizeof (struct sockaddr_in6)];
   struct sockaddr_in *v4;
   struct sockaddr_in6 *v6;
-  char dst[INET6_ADDRSTRLEN];
-  uint16_t port;
 
   if ((addrlen != sizeof (struct sockaddr_in)) &&
       (addrlen != sizeof (struct sockaddr_in6)))
@@ -1329,21 +1322,17 @@ tcp_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
     {
       v4 = (struct sockaddr_in *) buf;
       v4->sin_port = htons (check_port (plugin, ntohs (v4->sin_port)));
-      inet_ntop (AF_INET, &v4->sin_addr, dst, sizeof (dst));
-      port = ntohs (v4->sin_port);
     }
   else
     {
       v6 = (struct sockaddr_in6 *) buf;
       v6->sin6_port = htons (check_port (plugin, ntohs (v6->sin6_port)));
-      inet_ntop (AF_INET6, &v6->sin6_addr, dst, sizeof (dst));
-      port = ntohs (v6->sin6_port);
     }
 #if DEBUG_TCP
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                    "tcp",
-                   "Informing transport service about my address `%s:%u'.\n",
-                   dst, port);
+                   "Informing transport service about my address `%s'.\n",
+                   GNUNET_a2s(addr, addrlen));
 #endif
   plugin->env->notify_address (plugin->env->cls,
                                "tcp",
@@ -1627,7 +1616,6 @@ process_interfaces (void *cls,
                     const struct sockaddr *addr, socklen_t addrlen)
 {
   struct Plugin *plugin = cls;
-  char dst[INET6_ADDRSTRLEN];
   int af;
   struct sockaddr_in *v4;
   struct sockaddr_in6 *v6;
@@ -1636,19 +1624,18 @@ process_interfaces (void *cls,
   if (af == AF_INET)
     {
       v4 = (struct sockaddr_in *) addr;
-      inet_ntop (AF_INET, &v4->sin_addr, dst, sizeof (dst));
       v4->sin_port = htons (plugin->adv_port);
     }
   else
     {
       GNUNET_assert (af == AF_INET6);
       v6 = (struct sockaddr_in6 *) addr;
-      inet_ntop (AF_INET6, &v6->sin6_addr, dst, sizeof (dst));
       v6->sin6_port = htons (plugin->adv_port);
     }
   GNUNET_log_from (GNUNET_ERROR_TYPE_INFO |
                    GNUNET_ERROR_TYPE_BULK,
-                   "tcp", _("Found address `%s' (%s)\n"), dst, name);
+                   "tcp", _("Found address `%s' (%s)\n"), 
+                   GNUNET_a2s(addr, addrlen), name);
   plugin->env->notify_address (plugin->env->cls,
                                "tcp",
                                addr, addrlen, GNUNET_TIME_UNIT_FOREVER_REL);
diff --git a/src/transport/transport.h b/src/transport/transport.h
index 8e1291005..8ad26f2c1 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -27,7 +27,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_NO
+#define DEBUG_TRANSPORT GNUNET_YES
 
 /**
  * For how long do we allow unused bandwidth
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 8bca5084d..f7ce56afc 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -1564,16 +1564,17 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
       remove_neighbour (h, &dim->peer);
       break;
     case GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK:
-#if DEBUG_TRANSPORT
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Receiving `%s' message.\n", "SEND_OK");
-#endif
       if (size != sizeof (struct SendOkMessage))
         {
           GNUNET_break (0);
           break;
         }
       okm = (const struct SendOkMessage *) msg;
+#if DEBUG_TRANSPORT
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Receiving `%s' message, transmission %s.\n", "SEND_OK",
+                  ntohl(okm->success) == GNUNET_OK ? "succeeded" : "failed");
+#endif
       n = find_neighbour (h, &okm->peer);
       GNUNET_assert (n != NULL);
       n->transmit_ok = GNUNET_YES;
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 2fdd17ca7..8ea099122 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -398,6 +398,52 @@ GNUNET_i2s (const struct GNUNET_PeerIdentity *pid)
   return (const char *) ret.encoding;
 }
 
+
+
+/**
+ * Convert a "struct sockaddr*" (IPv4 or IPv6 address) to a string
+ * (for printing debug messages).  This is one of the very few calls
+ * in the entire API that is NOT reentrant!
+ *
+ * @param addr the address
+ * @param addrlen the length of the address
+ * @return nicely formatted string for the address
+ *  will be overwritten by next call to GNUNET_a2s.
+ */
+const char *GNUNET_a2s (const struct sockaddr *addr,
+                        socklen_t addrlen)
+{
+  static char buf[INET6_ADDRSTRLEN+8];
+  static char b2[6];
+  const struct sockaddr_in * v4;
+  const struct sockaddr_in6 *v6;
+  switch (addr->sa_family)
+    {
+    case AF_INET:
+      v4 = (const struct sockaddr_in*)addr;
+      inet_ntop(AF_INET, &v4->sin_addr, buf, INET_ADDRSTRLEN);
+      if (0 == ntohs(v4->sin_port))
+        return buf;     
+      strcat (buf, ":");
+      sprintf (b2, "%u", ntohs(v4->sin_port));
+      strcat (buf, b2);
+      return buf;
+    case AF_INET6:
+      v6 = (const struct sockaddr_in6*)addr;
+      buf[0] = '[';
+      inet_ntop(AF_INET6, &v6->sin6_addr, &buf[1], INET6_ADDRSTRLEN);
+      if (0 == ntohs(v6->sin6_port))
+        return &buf[1]; 
+      strcat (buf, "]:");
+      sprintf (b2, "%u", ntohs(v6->sin6_port));
+      strcat (buf, b2);
+      return buf;      
+    default:
+      return _("invalid address");
+    }
+}
+
+
 /**
  * Initializer
  */
diff --git a/src/util/network.c b/src/util/network.c
index 7fd6f6c47..0526bc844 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -40,7 +40,7 @@
 #include "gnunet_network_lib.h"
 #include "gnunet_scheduler_lib.h"
 
-#define DEBUG_NETWORK GNUNET_NO
+#define DEBUG_NETWORK GNUNET_YES
 
 struct GNUNET_NETWORK_TransmitHandle
 {
@@ -234,9 +234,7 @@ GNUNET_NETWORK_socket_create_from_accept (struct GNUNET_SCHEDULER_Handle
 {
   struct GNUNET_NETWORK_SocketHandle *ret;
   char addr[32];
-  char msg[INET6_ADDRSTRLEN];
   socklen_t addrlen;
-  int fam;
   int fd;
   int aret;
   struct sockaddr_in *v4;
@@ -287,19 +285,9 @@ GNUNET_NETWORK_socket_create_from_accept (struct GNUNET_SCHEDULER_Handle
       (GNUNET_YES != (aret = access (access_cls, uaddr, addrlen))))
     {
       if (aret == GNUNET_NO)
-        {
-          fam = ((struct sockaddr *) addr)->sa_family;
-          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                      _("Access denied to `%s'\n"),
-                      inet_ntop (fam,
-                                 (fam == AF_INET6)
-                                 ? (const void *) &((struct sockaddr_in6 *)
-                                                    &addr)->sin6_addr : (const
-                                                                         void
-                                                                         *)
-                                 &((struct sockaddr_in *) &addr)->sin_addr,
-                                 msg, sizeof (msg)));
-        }
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    _("Access denied to `%s'\n"),
+                    GNUNET_a2s(uaddr, addrlen));        
       GNUNET_break (0 == SHUTDOWN (fd, SHUT_RDWR));
       GNUNET_break (0 == CLOSE (fd));
       GNUNET_free (uaddr);
@@ -493,12 +481,22 @@ connect_continuation (void *cls,
       (0 != getsockopt (sock->sock, SOL_SOCKET, SO_ERROR, &error, &len)) ||
       (error != 0) || (errno != 0))
     {
+#if DEBUG_NETWORK
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Failed to establish TCP connection to `%s'\n",
+                  GNUNET_a2s(sock->addr, sock->addrlen));
+#endif
       /* connect failed / timed out */
       GNUNET_break (0 == CLOSE (sock->sock));
       sock->sock = -1;
       if (GNUNET_SYSERR == try_connect (sock))
         {
           /* failed for good */
+#if DEBUG_NETWORK
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Failed to establish TCP connection, no further addresses to try.\n");
+#endif
+          /* connect failed / timed out */
           GNUNET_break (sock->ai_pos == NULL);
           freeaddrinfo (sock->ai);
           sock->ai = NULL;
@@ -1052,10 +1050,6 @@ transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ssize_t ret;
   size_t have;
 
-#if DEBUG_NETWORK
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmit ready called --- will try to send\n");
-#endif
   GNUNET_assert (sock->write_task != GNUNET_SCHEDULER_NO_PREREQUISITE_TASK);
   sock->write_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK;
   if (sock->connect_task != GNUNET_SCHEDULER_NO_PREREQUISITE_TASK)
@@ -1091,6 +1085,10 @@ transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #endif
       goto SCHEDULE_WRITE;
     }
+#if DEBUG_NETWORK
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transmit ready called --- will try to send\n");
+#endif
   GNUNET_assert (sock->write_buffer_off >= sock->write_buffer_pos);
   process_notify (sock);
   have = sock->write_buffer_off - sock->write_buffer_pos;
diff --git a/src/util/service.c b/src/util/service.c
index cf9703235..8d72a749a 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -620,34 +620,26 @@ check_access (void *cls, const struct sockaddr *addr, socklen_t addrlen)
   const struct sockaddr_in *i4;
   const struct sockaddr_in6 *i6;
   int ret;
-  char buf[INET6_ADDRSTRLEN];
-  uint16_t port;
 
   switch (addr->sa_family)
     {
     case AF_INET:
       GNUNET_assert (addrlen == sizeof (struct sockaddr_in));
       i4 = (const struct sockaddr_in *) addr;
-      port = ntohs (i4->sin_port);
       ret = ((sctx->v4_allowed == NULL) ||
              (check_ipv4_listed (sctx->v4_allowed,
                                  &i4->sin_addr)))
         && ((sctx->v4_denied == NULL) ||
             (!check_ipv4_listed (sctx->v4_denied, &i4->sin_addr)));
-      if (ret != GNUNET_OK)
-        inet_ntop (AF_INET, &i4->sin_addr, buf, sizeof (buf));
       break;
     case AF_INET6:
       GNUNET_assert (addrlen == sizeof (struct sockaddr_in6));
       i6 = (const struct sockaddr_in6 *) addr;
-      port = ntohs (i6->sin6_port);
       ret = ((sctx->v6_allowed == NULL) ||
              (check_ipv6_listed (sctx->v6_allowed,
                                  &i6->sin6_addr)))
         && ((sctx->v6_denied == NULL) ||
             (!check_ipv6_listed (sctx->v6_denied, &i6->sin6_addr)));
-      if (ret != GNUNET_OK)
-        inet_ntop (AF_INET6, &i6->sin6_addr, buf, sizeof (buf));
       break;
     default:
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -657,8 +649,8 @@ check_access (void *cls, const struct sockaddr *addr, socklen_t addrlen)
   if (ret != GNUNET_OK)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("Access from `%s:%u' denied to service `%s'\n"),
-                  buf, port, sctx->serviceName);
+                  _("Access from `%s' denied to service `%s'\n"),
+                  GNUNET_a2s(addr, addrlen), sctx->serviceName);
     }
   return ret;
 }