- use proper channel_ack/data_ack

3 files changed, 16 insertions, 15 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index 8b90938b1..be4f7d0c0 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -1076,7 +1076,7 @@ GMCH_send_data (struct MeshChannel *ch,
  * @param fwd Is for FWD traffic? (ACK dest->owner)
  */
 void
-GMCH_send_ack (struct MeshChannel *ch, int fwd)
+GMCH_send_data_ack (struct MeshChannel *ch, int fwd)
 {
   struct GNUNET_MESH_DataACK msg;
   struct MeshChannelReliability *rel;
@@ -1414,7 +1414,7 @@ GMCH_handle_data (struct MeshChannel *ch,
                 mid, rel->mid_recv, rel->mid_recv + 64);
   }
 
-  GMCH_send_ack (ch, fwd);
+  GMCH_send_data_ack (ch, fwd);
 }
 
 
@@ -1541,7 +1541,8 @@ GMCH_handle_create (const struct GNUNET_MESH_ChannelCreate *msg,
     LOG (GNUNET_ERROR_TYPE_DEBUG, "!!! Reliable\n");
 
   GMCH_send_create (ch);
-  GMCH_send_ack (ch, fwd);
+  GMCH_send_data_ack (ch, fwd);
+  channel_send_ack (ch, !fwd);
 
   if (GNUNET_NO == ch->dest_rel->client_ready)
   {
diff --git a/src/mesh/gnunet-service-mesh_channel.h b/src/mesh/gnunet-service-mesh_channel.h
index 3b6769132..c6dbc7835 100644
--- a/src/mesh/gnunet-service-mesh_channel.h
+++ b/src/mesh/gnunet-service-mesh_channel.h
@@ -107,17 +107,6 @@ int
 GMCH_is_terminal (struct MeshChannel *ch, int fwd);
 
 /**
- * Send an end-to-end ACK message for the most recent in-sequence payload.
- *
- * If channel is not reliable, do nothing.
- *
- * @param ch Channel this is about.
- * @param fwd Is for FWD traffic? (ACK dest->owner)
- */
-void
-GMCH_send_ack (struct MeshChannel *ch, int fwd);
-
-/**
  * Send data on a channel.
  *
  * If the destination is local, send it to client, otherwise encrypt and
@@ -133,6 +122,17 @@ GMCH_send_data (struct MeshChannel *ch,
                 int fwd);
 
 /**
+ * Send an end-to-end ACK message for the most recent in-sequence payload.
+ *
+ * If channel is not reliable, do nothing.
+ *
+ * @param ch Channel this is about.
+ * @param fwd Is for FWD traffic? (ACK dest->owner)
+ */
+void
+GMCH_send_data_ack (struct MeshChannel *ch, int fwd);
+
+/**
  * Notify the destination client that a new incoming channel was created.
  *
  * @param ch Channel that was created.
diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c
index 453a94428..910b5f1f3 100644
--- a/src/mesh/gnunet-service-mesh_connection.c
+++ b/src/mesh/gnunet-service-mesh_connection.c
@@ -1685,7 +1685,7 @@ GMC_send_ack (struct MeshConnection *c, struct MeshChannel *ch, int fwd)
     {
       GNUNET_assert (NULL != ch);
       LOG (GNUNET_ERROR_TYPE_DEBUG, "  really sending!\n");
-      send_local_ack (ch, fwd);
+      GMCH_send_data_ack (ch, fwd);
     }
   }
   else if (NULL == c)