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

[gnunet]

Author: bartpolot
Date: 2013-10-11 19:56:46 +0200 (Fri, 11 Oct 2013)
New Revision: 30171

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
Log:
- send data ACK only after receiving the channel ACK


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-11 17:56:00 UTC 
(rev 30170)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-11 17:56:46 UTC 
(rev 30171)
@@ -625,7 +625,7 @@
  * Channel was ACK'd by remote peer, mark as ready and cancel retransmission.
  *
  * @param ch Channel to mark as ready.
- * @param fwd Was the CREATE message sent fwd?
+ * @param fwd Was the ACK message sent fwd? (dest->root, SYNACK)
  */
 static void
 channel_confirm (struct MeshChannel *ch, int fwd)
@@ -652,6 +652,7 @@
       /* TODO return? */
     }
   }
+  GMCH_send_data_ack (ch, fwd);
 
   /* In case of a FWD ACk (SYNACK) send a BCK ACK (ACK). */
   if (fwd)
@@ -1551,7 +1552,6 @@
 
   GMCH_send_create (ch);
   channel_send_ack (ch, fwd);
-  GMCH_send_data_ack (ch, fwd);
 
   if (GNUNET_NO == ch->dest_rel->client_ready)
   {