[GNUnet-SVN] [gnunet] branch master updated (0fb9f54b3 -> b9ea024cb)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository gnunet.

    from 0fb9f54b3 indentation fixes
     new 212addcc5 fix comments, fix test
     new b9ea024cb if in-order unreliable, advance to next message even if we 
skip a mid

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/cadet/gnunet-service-cadet-new_channel.c | 9 +++++----
 src/util/test_container_dll.c                | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cadet/gnunet-service-cadet-new_channel.c 
b/src/cadet/gnunet-service-cadet-new_channel.c
index ef1858c4b..ebc566c83 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -1084,8 +1084,8 @@ GCCH_handle_channel_open_ack (struct CadetChannel *ch)
  * Test if element @a e1 comes before element @a e2.
  *
  * @param cls closure, to a flag where we indicate duplicate packets
- * @param e1 an element of to sort
- * @param e2 another element to sort
+ * @param m1 a message of to sort
+ * @param m2 another message to sort
  * @return #GNUNET_YES if @e1 < @e2, otherwise #GNUNET_NO
  */
 static int
@@ -1108,7 +1108,7 @@ is_before (void *cls,
   }
   else
   {
-    /* result is small, thus v2 > v1, thus e1 < e2 */
+    /* result is small, thus v2 > v1, thus m1 < m2 */
     return GNUNET_YES;
   }
 }
@@ -1775,7 +1775,8 @@ GCCH_handle_local_ack (struct CadetChannel *ch,
   }
 
   if ( (com->mid.mid != ch->mid_recv.mid) &&
-       (GNUNET_NO == ch->out_of_order) )
+       (GNUNET_NO == ch->out_of_order) &&
+       (GNUNET_YES == ch->reliable) )
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Got LOCAL_ACK, %s-%X ready to receive more data (but next one is 
out-of-order %u vs. %u)!\n",
diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c
index a1954e8fa..4d2830807 100644
--- a/src/util/test_container_dll.c
+++ b/src/util/test_container_dll.c
@@ -72,7 +72,7 @@ int
 main (int argc, char **argv)
 {
   unsigned int values[] = {
-    4, 5, 8, 6, 9, 3, 7, 2, 6, 1, 0
+    4, 5, 8, 6, 9, 3, 7, 2, 1, 0
   };
   struct Element *head = NULL;
   struct Element *tail = NULL;

-- 
To stop receiving notification emails like this one, please contact
address@hidden