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

[gnunet]

Author: wachs
Date: 2012-06-15 17:28:11 +0200 (Fri, 15 Jun 2012)
New Revision: 22026

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
- fixes


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2012-06-15 15:25:51 UTC 
(rev 22025)
+++ gnunet/src/transport/gnunet-service-transport.c     2012-06-15 15:28:11 UTC 
(rev 22026)
@@ -341,7 +341,7 @@
   struct GNUNET_HELLO_Address address;
 
   GNUNET_assert (strlen (transport_name) > 0);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %X to peer `%s' ended \n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' ended \n",
               session, GNUNET_i2s (peer));
   if (NULL != session)
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-15 
15:25:51 UTC (rev 22025)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-06-15 
15:28:11 UTC (rev 22026)
@@ -2200,6 +2200,11 @@
                     address, session, ats, ats_count);    
     break;
   case S_CONNECT_RECV_BLACKLIST_INBOUND:
+    n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+    check_blacklist (&n->id,
+                     n->connect_ack_timestamp,
+                     address, session, ats, ats_count);
+    break;
   case S_CONNECT_RECV_BLACKLIST:
   case S_CONNECT_RECV_ACK:
     /* ATS asks us to switch while we were trying to connect; switch to new
@@ -2595,6 +2600,11 @@
                           ++neighbours_connected,
                           GNUNET_NO);
     connect_notify_cb (callback_cls, &n->id, ats, ats_count);
+    /* Tell ATS that the outbound session we created to send CONNECT was 
successfull */
+    GNUNET_ATS_address_add(GST_ats,
+                           n->primary_address.address,
+                           n->primary_address.session,
+                           ats, ats_count);
     set_address (&n->primary_address,
                 n->primary_address.address,
                 n->primary_address.session,
@@ -2712,7 +2722,6 @@
   }
 
   n->expect_latency_response = GNUNET_NO;
-
   switch (n->state)
   {
   case S_NOT_CONNECTED: