[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32707 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32707 - gnunet/src/transport |
Date: |
Thu, 20 Mar 2014 21:06:52 +0100 |
Author: wachs
Date: 2014-03-20 21:06:51 +0100 (Thu, 20 Mar 2014)
New Revision: 32707
Modified:
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
when switching addresses in connect_sent: no blacklist check required, switch
directly and send new connect
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2014-03-20
14:00:52 UTC (rev 32706)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2014-03-20
20:06:51 UTC (rev 32707)
@@ -2661,13 +2661,20 @@
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)
+ {
+ n->send_connect_ack = 2;
+ send_session_connect_ack_message (n->primary_address.address,
+ n->primary_address.session,
+ n->connect_ack_timestamp);
+ }
/* 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_state_and_timeout (n, GNUNET_TRANSPORT_PS_INIT_BLACKLIST,
- GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
- check_blacklist (&n->id, n->connect_ack_timestamp,
- blc_ctx->address, blc_ctx->session);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECT_SENT,
+ GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
+ send_session_connect (&n->primary_address);
break;
case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:
set_primary_address (n, blc_ctx->address, blc_ctx->session,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32707 - gnunet/src/transport,
gnunet <=