[GNUnet-SVN] r8515 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2009-06-09 20:47:55 -0600 (Tue, 09 Jun 2009)
New Revision: 8515

Modified:
   gnunet/src/core/gnunet-service-core.c
Log:
fix

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2009-06-10 02:44:49 UTC (rev 
8514)
+++ gnunet/src/core/gnunet-service-core.c       2009-06-10 02:47:55 UTC (rev 
8515)
@@ -1500,6 +1500,9 @@
       next = pos->next;
       if (pos->deadline.value < cutoff.value)
        {
+         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                     "Message is %llu ms past due, discarding.\n",
+                     cutoff.value - pos->deadline.value);
          if (prev == NULL)
            n->messages = next;
          else
@@ -1595,6 +1598,7 @@
       /* ready to continue */
       break;
     }
+  discard_expired_messages (n);
   if (n->messages == NULL)
     {
 #if DEBUG_CORE
@@ -1604,7 +1608,6 @@
 #endif
       return;                   /* no pending messages */
     }
-  discard_expired_messages (n);
   if (n->encrypted_head != NULL)
     {
 #if DEBUG_CORE
@@ -1619,7 +1622,6 @@
   deadline = GNUNET_TIME_UNIT_FOREVER_ABS;
   priority = 0;
   used = sizeof (struct EncryptedMessage);
-
   used += batch_message (n,
                          &pbuf[used],
                          MAX_ENCRYPTED_MESSAGE_SIZE - used,