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

[gnunet]

Author: wachs
Date: 2013-05-14 10:33:14 +0200 (Tue, 14 May 2013)
New Revision: 27112

Modified:
   gnunet/src/transport/gnunet-service-transport_clients.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/transport_api.c
Log:
compile error in udp
additional debug messages for transport connections


Modified: gnunet/src/transport/gnunet-service-transport_clients.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_clients.c     2013-05-14 
08:10:14 UTC (rev 27111)
+++ gnunet/src/transport/gnunet-service-transport_clients.c     2013-05-14 
08:33:14 UTC (rev 27112)
@@ -704,7 +704,12 @@
                         int result)
 {
   if (GNUNET_OK != result)
+  {
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                     "Blacklist refuses connection attempt to peer `%s'\n",
+                     GNUNET_i2s (peer));
     return;                     /* not allowed */
+  }
   GST_neighbours_try_connect (peer);
 }
 

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-05-14 
08:10:14 UTC (rev 27111)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-05-14 
08:33:14 UTC (rev 27112)
@@ -1840,12 +1840,16 @@
   struct NeighbourMapEntry *n;
 
   if (NULL == neighbours)  
-    return; /* during shutdown, do nothing */
+  {
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                     "Asked to connect to peer `%s' during shutdown\n",
+                     GNUNET_i2s (target));
+               return; /* during shutdown, do nothing */
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
              "Asked to connect to peer `%s'\n",
               GNUNET_i2s (target));
-  if (0 ==
-      memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity)))
+  if (0 == memcmp (target, &GST_my_identity, sizeof (struct 
GNUNET_PeerIdentity)))
   {
     /* refuse to connect to myself */
     /* FIXME: can this happen? Is this not an API violation? */

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-05-14 08:10:14 UTC (rev 
27111)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-05-14 08:33:14 UTC (rev 
27112)
@@ -2681,7 +2681,7 @@
     else
     {
 #if HAVE_SOCKADDR_IN_SIN_LEN
-      serverAddrv6->sin6_len = sizeof (serverAddrv6);
+      serverAddrv6->sin6_len = sizeof (struct sockaddr_in6);
 #endif
       serverAddrv6->sin6_family = AF_INET6;
       serverAddrv6->sin6_addr = in6addr_any;
@@ -2691,8 +2691,9 @@
       LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 port %d\n",
            ntohs (serverAddrv6->sin6_port));
       tries = 0;
-      while (GNUNET_NETWORK_socket_bind (plugin->sockv6, serverAddrv6, 
addrlen) !=
-             GNUNET_OK)
+      while (GNUNET_OK != GNUNET_NETWORK_socket_bind (plugin->sockv6,
+                                                                               
                                                (struct sockaddr *) 
serverAddrv6,
+                                                                               
                                                addrlen))
       {
         serverAddrv6->sin6_port = htons (GNUNET_CRYPTO_random_u32 
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);        /* Find a good, non-root 
port */
         LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -2727,7 +2728,7 @@
   else
   {
 #if HAVE_SOCKADDR_IN_SIN_LEN
-    serverAddrv4->sin_len = sizeof (serverAddrv4);
+    serverAddrv4->sin_len = sizeof (struct sockaddr_in);
 #endif
     serverAddrv4->sin_family = AF_INET;
     serverAddrv4->sin_addr.s_addr = INADDR_ANY;

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2013-05-14 08:10:14 UTC (rev 
27111)
+++ gnunet/src/transport/transport_api.c        2013-05-14 08:33:14 UTC (rev 
27112)
@@ -1055,6 +1055,9 @@
       tch->cb (tch->cb_cls, GNUNET_SYSERR);
     GNUNET_CONTAINER_DLL_remove (tch->th->tc_head, tch->th->tc_tail, tch);
     GNUNET_free (tch);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Discarding  `%s' request to `%4s' due to error in transport service 
connection.\n", "REQUEST_CONNECT",
+         GNUNET_i2s (&tch->pid));
     return 0;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,