diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-06-13 17:30:46 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-06-13 17:30:46 +0000 |
commit | f506d97f73cc35143fdfa67b2692a6ba839e898c (patch) | |
tree | f3ec7c3be28d5bd55c6ce15580cdf00be323c40f /src/mesh/mesh2_api.c | |
parent | 778901fed003c53ffc0b58c72978448bd0afe834 (diff) | |
download | gnunet-f506d97f73cc35143fdfa67b2692a6ba839e898c.tar.gz gnunet-f506d97f73cc35143fdfa67b2692a6ba839e898c.zip |
- change service to support client explicit ACK
- simplify tunnel destruction code
- typos, documentation
Diffstat (limited to 'src/mesh/mesh2_api.c')
-rw-r--r-- | src/mesh/mesh2_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesh/mesh2_api.c b/src/mesh/mesh2_api.c index c19758e13..810d9c8c1 100644 --- a/src/mesh/mesh2_api.c +++ b/src/mesh/mesh2_api.c | |||
@@ -597,7 +597,7 @@ send_ack (struct GNUNET_MESH_Tunnel *t) | |||
597 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK); | 597 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK); |
598 | msg.header.size = htons (sizeof (msg)); | 598 | msg.header.size = htons (sizeof (msg)); |
599 | msg.tunnel_id = htonl (t->tid); | 599 | msg.tunnel_id = htonl (t->tid); |
600 | msg.max_pid = htonl (t->last_ack_sent); | 600 | msg.ack = htonl (t->last_ack_sent); |
601 | 601 | ||
602 | #if DEBUG_ACK | 602 | #if DEBUG_ACK |
603 | t->mesh->acks_sent++; | 603 | t->mesh->acks_sent++; |
@@ -981,7 +981,7 @@ process_ack (struct GNUNET_MESH_Handle *h, | |||
981 | ntohl (msg->tunnel_id)); | 981 | ntohl (msg->tunnel_id)); |
982 | return; | 982 | return; |
983 | } | 983 | } |
984 | ack = ntohl (msg->max_pid); | 984 | ack = ntohl (msg->ack); |
985 | LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X, ack %u!\n", t->tid, ack); | 985 | LOG (GNUNET_ERROR_TYPE_DEBUG, " on tunnel %X, ack %u!\n", t->tid, ack); |
986 | if (GNUNET_YES == GMC_is_pid_bigger(ack, t->last_ack_recv)) | 986 | if (GNUNET_YES == GMC_is_pid_bigger(ack, t->last_ack_recv)) |
987 | t->last_ack_recv = ack; | 987 | t->last_ack_recv = ack; |