prevent same message from being requested twice by always skipping head-of-queue when inserting (possibly related to 1957)

1 files changed, 4 insertions, 7 deletions

diff --git a/src/core/core_api.c b/src/core/core_api.c
index 09a5c54a8..a279874d7 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -1423,15 +1423,12 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork,
     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;