X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore_api.c;h=66df134fb1acaf7c5ace5f77f1f02c79a954bf14;hb=b0c7119fa2f43fe1b5978651152974359de5a5d2;hp=f3f4cea540d7257b2cd651aab3b79995cc0d9625;hpb=83b19539f4d322b43683f5838b72e9ec2c8e6073;p=oweals%2Fgnunet.git

diff --git a/src/core/core_api.c b/src/core/core_api.c
index f3f4cea54..66df134fb 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -421,7 +421,7 @@ disconnect_and_free_peer_entry (void *cls, const GNUNET_HashCode * key,
                  GNUNET_CONTAINER_multihashmap_remove (h->peers, key, pr));
   GNUNET_assert (pr->pending_head == NULL);
   GNUNET_assert (pr->pending_tail == NULL);
-  GNUNET_assert (pr->ch = h);
+  GNUNET_assert (pr->ch == h);
   GNUNET_assert (pr->queue_size == 0);
   GNUNET_assert (pr->timeout_task == GNUNET_SCHEDULER_NO_TASK);
   GNUNET_assert (pr->ntr_task == GNUNET_SCHEDULER_NO_TASK);
@@ -984,8 +984,8 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       if ((mh->expected_size != ntohs (em->size)) && (mh->expected_size != 0))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Unexpected message size for message of type %u\n",
-                    mh->type);
+                    "Unexpected message size %u for message of type %u from peer `%4s'\n",
+                    htons (em->size), mh->type, GNUNET_i2s (&ntm->peer));
         GNUNET_break_op (0);
         continue;
       }
@@ -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;