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

[gnunet]

Author: wachs
Date: 2011-10-25 18:54:19 +0200 (Tue, 25 Oct 2011)
New Revision: 17750

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours_fsm.c
Log:
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




Modified: gnunet/src/transport/gnunet-service-transport_neighbours_fsm.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours_fsm.c      
2011-10-25 16:36:01 UTC (rev 17749)
+++ gnunet/src/transport/gnunet-service-transport_neighbours_fsm.c      
2011-10-25 16:54:19 UTC (rev 17750)
@@ -954,7 +954,8 @@
   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 @@
     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 @@
     GNUNET_break (0);
     return;
   }
-
-  change_state (n, S_CONNECTED);
   neighbour_connected (n, ats, ats_count);
 }
 
@@ -1546,7 +1545,8 @@
     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);