From 64d8b62366d5c9d63ded495a31cb63b643a67f3f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 25 Jan 2017 19:42:06 +0100 Subject: [PATCH] typo in comment --- src/cadet/gnunet-service-cadet-new_channel.c | 9 +++++++++ src/include/gnunet_container_lib.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cadet/gnunet-service-cadet-new_channel.c b/src/cadet/gnunet-service-cadet-new_channel.c index 8812af4ec..29ad732b0 100644 --- a/src/cadet/gnunet-service-cadet-new_channel.c +++ b/src/cadet/gnunet-service-cadet-new_channel.c @@ -1285,6 +1285,11 @@ handle_matching_ack (struct CadetChannel *ch, GCCH_2s (ch), (unsigned int) ntohl (crm->data_message->mid.mid), ch->pending_messages); + if (NULL != crm->qe) + { + GCT_send_cancel (crm->qe); + crm->qe = NULL; + } GNUNET_free (crm->data_message); GNUNET_free (crm); send_ack_to_client (ch, @@ -1331,14 +1336,18 @@ GCCH_handle_channel_plaintext_data_ack (struct CadetChannel *ch, { handle_matching_ack (ch, crm); + found = GNUNET_YES; continue; } delta = (unsigned int) (ntohl (crm->data_message->mid.mid) - mid_base) - 1; if (delta >= 64) continue; if (0 != (mid_mask & (1LLU << delta))) + { handle_matching_ack (ch, crm); + found = GNUNET_YES; + } } if (GNUNET_NO == found) { diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index cb5d0e595..e6f4ba43b 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -2092,7 +2092,7 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (struct GNUNET_CONTAINER_MultiH element, \ head)) ) \ { \ - /* insert at head, e;e,emt < head */ \ + /* insert at head, element < head */ \ GNUNET_CONTAINER_DLL_insert (head, \ tail, \ element); \ -- 2.25.1