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

[gnunet]

Author: grothoff
Date: 2011-11-24 11:23:14 +0100 (Thu, 24 Nov 2011)
New Revision: 18291

Modified:
   gnunet/src/core/core_api.c
Log:
prevent same message from being requested twice by always skipping 
head-of-queue when inserting (possibly related to 1957)

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2011-11-24 10:06:44 UTC (rev 18290)
+++ gnunet/src/core/core_api.c  2011-11-24 10:23:14 UTC (rev 18291)
@@ -1423,15 +1423,12 @@
     GNUNET_free (minp);
   }
 
-  /* Order entries by deadline, but SKIP 'HEAD' if
-   * we're in the 'ready_peer_*' DLL */
+  /* Order entries by deadline, but SKIP 'HEAD' (as we may have transmitted
+     that request already or might even already be approved to transmit that
+     message to core) */
   pos = pr->pending_head;
-  if ((pr->prev != NULL) || (pr->next != NULL) ||
-      (pr == handle->ready_peer_head))
-  {
-    GNUNET_assert (pos != NULL);
+  if (pos != NULL)
     pos = pos->next;            /* skip head */
-  }
 
   /* insertion sort */
   prev = pos;