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

[gnunet]

Author: grothoff
Date: 2011-10-03 00:16:00 +0200 (Mon, 03 Oct 2011)
New Revision: 17149

Modified:
   gnunet/src/core/gnunet-service-core.c
Log:
fix #1713 (see discussion there)

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2011-09-30 21:06:03 UTC (rev 
17148)
+++ gnunet/src/core/gnunet-service-core.c       2011-10-02 22:16:00 UTC (rev 
17149)
@@ -2492,13 +2492,16 @@
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_TIME_Relative delta;
   int disc;
+  unsigned int queue_length;
 
   disc = GNUNET_NO;
   now = GNUNET_TIME_absolute_get ();
   prev = NULL;
+  queue_length = 0;
   pos = n->messages;
   while (pos != NULL)
   {
+    queue_length++;
     next = pos->next;
     delta = GNUNET_TIME_absolute_get_difference (pos->deadline, now);
     if (delta.rel_value > PAST_EXPIRATION_DISCARD_TIME.rel_value)
@@ -2523,7 +2526,8 @@
       prev = pos;
     pos = next;
   }
-  if (GNUNET_YES == disc)
+  if ( (GNUNET_YES == disc) &&
+       (queue_length == MAX_PEER_QUEUE_SIZE) )
     schedule_peer_messages (n);
 }