aboutsummaryrefslogtreecommitdiff
path: root/src/util/mq.c
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-11-24 23:04:19 +0100
committerlurchi <lurchi@strangeplace.net>2017-11-24 23:04:19 +0100
commitb31af32af0dbf2f38b39cb4e3cdfada4ad313c77 (patch)
tree153326cefc724188043ebb5e5280b3c9d5d2937c /src/util/mq.c
parent71e1a09e349d557e76cb9acdb4718d312edc8926 (diff)
downloadgnunet-b31af32af0dbf2f38b39cb4e3cdfada4ad313c77.tar.gz
gnunet-b31af32af0dbf2f38b39cb4e3cdfada4ad313c77.zip
revert commit 6490b5f31e58e9ec008f8c5ceda28f6054f1bbba
Diffstat (limited to 'src/util/mq.c')
-rw-r--r--src/util/mq.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/src/util/mq.c b/src/util/mq.c
index 6ad6b82eb..57d2d05c5 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -61,7 +61,7 @@ struct GNUNET_MQ_Envelope
61 GNUNET_SCHEDULER_TaskCallback sent_cb; 61 GNUNET_SCHEDULER_TaskCallback sent_cb;
62 62
63 /** 63 /**
64 * Closure for @e sent_cb 64 * Closure for @e send_cb
65 */ 65 */
66 void *sent_cls; 66 void *sent_cls;
67 67
@@ -221,10 +221,8 @@ GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq,
221 uint16_t mtype = ntohs (mh->type); 221 uint16_t mtype = ntohs (mh->type);
222 222
223 LOG (GNUNET_ERROR_TYPE_DEBUG, 223 LOG (GNUNET_ERROR_TYPE_DEBUG,
224 "Queue %p received message of type %u and size %u\n", 224 "Received message of type %u and size %u\n",
225 mq, 225 mtype, msize);
226 mtype,
227 msize);
228 226
229 if (NULL == mq->handlers) 227 if (NULL == mq->handlers)
230 goto done; 228 goto done;
@@ -359,11 +357,6 @@ GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq,
359 } 357 }
360 GNUNET_assert (NULL == mq->envelope_head); 358 GNUNET_assert (NULL == mq->envelope_head);
361 mq->current_envelope = ev; 359 mq->current_envelope = ev;
362
363 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
364 "mq: sending message of type %u, queue empty\n",
365 ntohs(ev->mh->type));
366
367 mq->send_impl (mq, 360 mq->send_impl (mq,
368 ev->mh, 361 ev->mh,
369 mq->impl_state); 362 mq->impl_state);
@@ -459,10 +452,6 @@ impl_send_continue (void *cls)
459 GNUNET_CONTAINER_DLL_remove (mq->envelope_head, 452 GNUNET_CONTAINER_DLL_remove (mq->envelope_head,
460 mq->envelope_tail, 453 mq->envelope_tail,
461 mq->current_envelope); 454 mq->current_envelope);
462
463 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
464 "mq: sending message of type %u from queue\n", ntohs(mq->current_envelope->mh->type));
465
466 mq->send_impl (mq, 455 mq->send_impl (mq,
467 mq->current_envelope->mh, 456 mq->current_envelope->mh,
468 mq->impl_state); 457 mq->impl_state);
@@ -945,10 +934,6 @@ GNUNET_MQ_send_cancel (struct GNUNET_MQ_Envelope *ev)
945 GNUNET_CONTAINER_DLL_remove (mq->envelope_head, 934 GNUNET_CONTAINER_DLL_remove (mq->envelope_head,
946 mq->envelope_tail, 935 mq->envelope_tail,
947 mq->current_envelope); 936 mq->current_envelope);
948
949 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
950 "mq: sending canceled message of type %u queue\n", ntohs(ev->mh->type));
951
952 mq->send_impl (mq, 937 mq->send_impl (mq,
953 mq->current_envelope->mh, 938 mq->current_envelope->mh,
954 mq->impl_state); 939 mq->impl_state);