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

[gnunet]

Author: nevans
Date: 2011-07-11 17:43:11 +0200 (Mon, 11 Jul 2011)
New Revision: 15931

Modified:
   gnunet/src/transport/gnunet-service-transport.c
Log:
transport minor changes

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-07-11 15:21:19 UTC 
(rev 15930)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-07-11 15:43:11 UTC 
(rev 15931)
@@ -1932,14 +1932,10 @@
     return; /* nothing to do */
   cnt = GNUNET_YES;
   pos = fal->ready_list->addresses;
+
   while (pos != NULL)
     {
-      /* Always prefer inbound addresses, provided they are still live */
-      if ((GNUNET_YES == pos->connected) && (0 == pos->addrlen))
-        {
-          return;
-        }
-      else if (GNUNET_YES == pos->connected)
+      if (GNUNET_YES == pos->connected)
        {
 #if DEBUG_TRANSPORT
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1958,6 +1954,7 @@
        }
       pos = pos->next;
     }
+
   fal->connected = GNUNET_YES;
   if (GNUNET_YES == cnt)
     {
@@ -2082,7 +2079,6 @@
     }
 
   return best_address;
-
 }
 
 
@@ -3649,6 +3645,11 @@
   caec.tname = tp->short_name;
   caec.session = peer_address->session;
   caec.exists = GNUNET_NO;
+
+  /* Inbound address, we won't have in validation map! */
+  if (0 == peer_address->addrlen)
+    fprintf(stderr, "Sending periodic ping to inbound address!??\n");
+
   GNUNET_CONTAINER_multihashmap_iterate (validation_map,
                                          &check_address_exists,
                                          &caec);
@@ -5983,7 +5984,10 @@
                                      "<inbound>",
                                      (foreign_address_iterator->connected
                                          == GNUNET_YES) ? "CONNECTED"
-                                         : "DISCONNECTED");
+                                         : "DISCONNECTED",
+                                     (foreign_address_iterator->validated
+                                         == GNUNET_YES) ? "VALIDATED"
+                                         : "UNVALIDATED");
                   transmit_address_to_client (tc, addr_buf);
                   GNUNET_free(addr_buf);
                 }