gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r28997 - gnunet/src/mesh


From: gnunet
Subject: [GNUnet-SVN] r28997 - gnunet/src/mesh
Date: Thu, 5 Sep 2013 01:19:12 +0200

Author: bartpolot
Date: 2013-09-05 01:19:11 +0200 (Thu, 05 Sep 2013)
New Revision: 28997

Modified:
   gnunet/src/mesh/gnunet-service-mesh-enc.c
Log:
- send connection handshake before data

Modified: gnunet/src/mesh/gnunet-service-mesh-enc.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-09-04 17:09:49 UTC (rev 
28996)
+++ gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-09-04 23:19:11 UTC (rev 
28997)
@@ -4882,7 +4882,8 @@
       break;
     case GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK:
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "*   path ack\n");
-      if (connection_is_origin (c, GNUNET_NO))
+      if (connection_is_origin (c, GNUNET_NO) ||
+          connection_is_origin (c, GNUNET_YES))
         data_size = send_core_connection_ack (queue->c, size, buf);
       else
         data_size = send_core_data_raw (queue->cls, size, buf);
@@ -5485,13 +5486,13 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  Connection (SYN)ACK for us!\n");
     if (MESH_TUNNEL_READY != c->t->state)
       tunnel_change_state (c->t, MESH_TUNNEL_READY);
+    send_connection_ack (c, GNUNET_NO);
     tunnel_send_queued_data (c->t, GNUNET_YES);
     if (3 <= tunnel_count_connections (c->t) && NULL != c->t->peer->dhtget)
     {
       GNUNET_DHT_get_stop (c->t->peer->dhtget);
       c->t->peer->dhtget = NULL;
     }
-    send_connection_ack (c, GNUNET_NO);
     connection_change_state (c, MESH_CONNECTION_READY);
     return GNUNET_OK;
   }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]