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

[gnunet]

Author: wachs
Date: 2014-03-21 20:53:29 +0100 (Fri, 21 Mar 2014)
New Revision: 32746

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/transport_api_monitoring.c
Log:
remove unsued INIT_BLACKLIST state: blacklist check is done before switching


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2014-03-21 
19:34:21 UTC (rev 32745)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2014-03-21 
19:53:29 UTC (rev 32746)
@@ -1052,7 +1052,6 @@
   {
   case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
   case GNUNET_TRANSPORT_PS_INIT_ATS:
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
     /* other peer is completely unaware of us, no need to send DISCONNECT */
     free_neighbour (n, GNUNET_NO);
     return;
@@ -2089,7 +2088,6 @@
       free_neighbour (n, GNUNET_NO);
       break;
     case GNUNET_TRANSPORT_PS_INIT_ATS:
-    case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
     case GNUNET_TRANSPORT_PS_CONNECT_SENT:
     case GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST_INBOUND:
     case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:
@@ -2197,38 +2195,6 @@
     /* waiting on ATS suggestion; still, pass address to ATS as a
        possibility */
     break;
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
-    /* check if the address the blacklist was fine with matches
-       ATS suggestion, if so, we can move on! */
-    if ( (GNUNET_OK == result) &&
-        (1 == n->send_connect_ack) )
-    {
-      n->send_connect_ack = 2;
-      send_session_connect_ack_message (bcc->na.address,
-                                       bcc->na.session,
-                                       n->connect_ack_timestamp);
-    }
-    if (GNUNET_YES != address_matches (&bcc->na, &n->primary_address))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Blacklist result for peer %s is for non-primary address, 
ignored\n",
-                  GNUNET_i2s (peer));
-      break; /* result for an address we currently don't care about */
-    }
-    if (GNUNET_OK == result)
-    {
-      set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECT_SENT,
-          GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
-      send_session_connect (&n->primary_address);
-    }
-    else
-    {
-      free_address (&n->primary_address);
-      GNUNET_break (0);
-      set_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_ATS,
-          GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
-    }
-    break;
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
     /* waiting on CONNECT_ACK, send ACK if one is pending */
     if ( (GNUNET_OK == result) &&
@@ -2495,7 +2461,6 @@
     /* CONNECT message takes priority over us asking ATS for address */
     set_state (n, GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST_INBOUND);
     /* fallthrough */
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST_INBOUND:
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:
@@ -2654,14 +2619,6 @@
         GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
     send_session_connect (&n->primary_address);
     break;
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
-    /* ATS suggests a different address, switch again */
-    set_primary_address (n, blc_ctx->address, blc_ctx->session,
-        blc_ctx->bandwidth_in, blc_ctx->bandwidth_out, GNUNET_NO);
-    set_timeout (n, GNUNET_TIME_relative_to_absolute 
(BLACKLIST_RESPONSE_TIMEOUT));
-    check_blacklist (&n->id, n->connect_ack_timestamp,
-                     blc_ctx->address, blc_ctx->session);
-    break;
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
     /* waiting on CONNECT_ACK, send ACK if one is pending */
     if (1 == n->send_connect_ack)
@@ -3079,16 +3036,6 @@
       return;
     }
     break;
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
-    if (0 == delay.rel_value_us)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Connection to `%s' timed out waiting for BLACKLIST to 
approve address\n",
-                 GNUNET_i2s (&n->id));
-      free_neighbour (n, GNUNET_NO);
-      return;
-    }
-    break;
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
     if (0 == delay.rel_value_us)
     {
@@ -3317,7 +3264,6 @@
     free_neighbour (n, GNUNET_NO);
     return GNUNET_SYSERR;
   case GNUNET_TRANSPORT_PS_INIT_ATS:
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop
                               ("# unexpected CONNECT_ACK messages (not 
ready)"),
@@ -3477,7 +3423,6 @@
     GNUNET_break (0);
     free_neighbour (n, GNUNET_NO);
     return GNUNET_YES;
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
     /* The session used to send the CONNECT terminated:
      * this implies a connect error*/
@@ -3878,7 +3823,6 @@
   case GNUNET_TRANSPORT_PS_RECONNECT_BLACKLIST:
     return n->latency;
   case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
   case GNUNET_TRANSPORT_PS_INIT_ATS:
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST_INBOUND:
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:

Modified: gnunet/src/transport/transport_api_monitoring.c
===================================================================
--- gnunet/src/transport/transport_api_monitoring.c     2014-03-21 19:34:21 UTC 
(rev 32745)
+++ gnunet/src/transport/transport_api_monitoring.c     2014-03-21 19:53:29 UTC 
(rev 32746)
@@ -153,7 +153,6 @@
   {
   case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
   case GNUNET_TRANSPORT_PS_INIT_ATS:
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST_INBOUND:
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:
@@ -195,8 +194,6 @@
     return "S_NOT_CONNECTED";
   case GNUNET_TRANSPORT_PS_INIT_ATS:
     return "S_INIT_ATS";
-  case GNUNET_TRANSPORT_PS_INIT_BLACKLIST:
-    return "S_INIT_BLACKLIST";
   case GNUNET_TRANSPORT_PS_CONNECT_SENT:
     return "S_CONNECT_SENT";
   case GNUNET_TRANSPORT_PS_CONNECT_RECV_BLACKLIST_INBOUND: