[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30153 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30153 - gnunet/src/mesh |
Date: |
Fri, 11 Oct 2013 16:53:38 +0200 |
Author: bartpolot
Date: 2013-10-11 16:53:38 +0200 (Fri, 11 Oct 2013)
New Revision: 30153
Modified:
gnunet/src/mesh/gnunet-service-mesh_channel.c
gnunet/src/mesh/gnunet-service-mesh_channel.h
gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- use proper channel_ack/data_ack
Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c 2013-10-11 14:50:07 UTC
(rev 30152)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c 2013-10-11 14:53:38 UTC
(rev 30153)
@@ -1076,7 +1076,7 @@
* @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 @@
mid, rel->mid_recv, rel->mid_recv + 64);
}
- GMCH_send_ack (ch, fwd);
+ GMCH_send_data_ack (ch, fwd);
}
@@ -1541,7 +1541,8 @@
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)
{
Modified: gnunet/src/mesh/gnunet-service-mesh_channel.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.h 2013-10-11 14:50:07 UTC
(rev 30152)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.h 2013-10-11 14:53:38 UTC
(rev 30153)
@@ -107,17 +107,6 @@
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 @@
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.
Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c 2013-10-11 14:50:07 UTC
(rev 30152)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c 2013-10-11 14:53:38 UTC
(rev 30153)
@@ -1685,7 +1685,7 @@
{
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30153 - gnunet/src/mesh,
gnunet <=