From 9c4741e490a1b193feb1a6b925d4cdd84ba7b0c2 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 25 Oct 2011 16:54:19 +0000 Subject: implemented: send connect send connect_ack receive connect_ack -> mark peer as connected next step: send ack or wait for payload and include ack mark other half as connected --- src/transport/gnunet-service-transport_neighbours_fsm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/transport') diff --git a/src/transport/gnunet-service-transport_neighbours_fsm.c b/src/transport/gnunet-service-transport_neighbours_fsm.c index f9794967a..ea92e776f 100644 --- a/src/transport/gnunet-service-transport_neighbours_fsm.c +++ b/src/transport/gnunet-service-transport_neighbours_fsm.c @@ -954,7 +954,8 @@ GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target) GNUNET_assert (neighbours != NULL); n = lookup_neighbour (target); - if ((NULL == n) || (n->is_connected != GNUNET_YES)) + + if ((NULL == n) || (n->state != S_CONNECTED)) return GNUNET_NO; /* not connected */ return GNUNET_YES; } @@ -1440,7 +1441,7 @@ static void neighbour_connected (struct NeighbourMapEntry *n, return; // First tell clients about connected neighbours... //change_state (n, S_CONNECTED); - + change_state (n, S_CONNECTED); neighbours_connected++; GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1, GNUNET_NO); @@ -1494,8 +1495,6 @@ GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, GNUNET_break (0); return; } - - change_state (n, S_CONNECTED); neighbour_connected (n, ats, ats_count); } @@ -1546,7 +1545,8 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, return; change_state (n, S_CONNECT_RECV); - /* send CONNECT_ACK */ + + /* send CONNECT_ACK (SYN_ACK)*/ connect_msg.header.size = htons (sizeof (struct SessionConnectMessage)); connect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK); -- cgit v1.2.3