[GNUnet-SVN] r15968 - gnunet/src/fragmentation

[gnunet]

Author: grothoff
Date: 2011-07-14 19:37:30 +0200 (Thu, 14 Jul 2011)
New Revision: 15968

Modified:
   gnunet/src/fragmentation/defragmentation.c
Log:
never discard current mc

Modified: gnunet/src/fragmentation/defragmentation.c
===================================================================
--- gnunet/src/fragmentation/defragmentation.c  2011-07-14 17:27:25 UTC (rev 
15967)
+++ gnunet/src/fragmentation/defragmentation.c  2011-07-14 17:37:30 UTC (rev 
15968)
@@ -393,7 +393,10 @@
                               old);
   dc->list_size--;
   if (GNUNET_SCHEDULER_NO_TASK != old->ack_task)
-    GNUNET_SCHEDULER_cancel (old->ack_task);
+    {
+      GNUNET_SCHEDULER_cancel (old->ack_task);
+      old->ack_task = GNUNET_SCHEDULER_NO_TASK;
+    }
   GNUNET_free (old);
 }
 
@@ -483,12 +486,12 @@
        mc->bits = UINT64_MAX;      /* set all 64 bit */
       else
        mc->bits = (1LL << n) - 1; /* set lowest 'bits' bit */
+      if (dc->list_size >= dc->num_msgs)
+       discard_oldest_mc (dc);
       GNUNET_CONTAINER_DLL_insert (dc->head,
                                   dc->tail,
                                   mc);
       dc->list_size++;
-      if (dc->list_size > dc->num_msgs)
-       discard_oldest_mc (dc);
     }
 
   /* copy data to 'mc' */