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

[gnunet]

Author: bartpolot
Date: 2013-10-18 05:39:22 +0200 (Fri, 18 Oct 2013)
New Revision: 30276

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- fix ACK direction 


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-18 02:23:43 UTC 
(rev 30275)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-10-18 03:39:22 UTC 
(rev 30276)
@@ -718,7 +718,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 ACK message sent fwd? (dest->root, SYNACK)
+ * @param fwd Was the ACK message a FWD ACK? (dest->root, SYNACK)
  */
 static void
 channel_confirm (struct MeshChannel *ch, int fwd)
@@ -1191,6 +1191,9 @@
 void
 GMCH_allow_client (struct MeshChannel *ch, int fwd)
 {
+  if (MESH_CHANNEL_READY != ch->state)
+    return;
+
   send_client_ack (ch, fwd);
 }
 

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-10-18 02:23:43 UTC 
(rev 30275)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-10-18 03:39:22 UTC 
(rev 30276)
@@ -1182,7 +1182,7 @@
     return;
   }
   if (NULL == t->channel_head ||
-      GNUNET_NO == GMCH_is_origin (t->channel_head->ch, fwd))
+      GNUNET_NO == GMCH_is_origin (t->channel_head->ch, !fwd))
   {
     GNUNET_break (0);
     return;