diff options
author | Bart Polot <bart@net.in.tum.de> | 2015-06-10 12:08:16 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2015-06-10 12:08:16 +0000 |
commit | aefe7ee20e178f6c48e632c78f610dfd0a6cd62c (patch) | |
tree | 36a477fc89b2d81a1f3c5dd16cd9152e3683ca2d /src | |
parent | f7f0f7e25da6e4b68ea1dc1da30a6d544ff5f69d (diff) | |
download | gnunet-aefe7ee20e178f6c48e632c78f610dfd0a6cd62c.tar.gz gnunet-aefe7ee20e178f6c48e632c78f610dfd0a6cd62c.zip |
- fix poll log
Diffstat (limited to 'src')
-rw-r--r-- | src/cadet/gnunet-service-cadet_connection.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 3626e47e5..13afdb28f 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c | |||
@@ -2824,12 +2824,12 @@ GCC_destroy (struct CadetConnection *c) | |||
2824 | if (NULL != c->fwd_fc.poll_task) | 2824 | if (NULL != c->fwd_fc.poll_task) |
2825 | { | 2825 | { |
2826 | GNUNET_SCHEDULER_cancel (c->fwd_fc.poll_task); | 2826 | GNUNET_SCHEDULER_cancel (c->fwd_fc.poll_task); |
2827 | LOG (GNUNET_ERROR_TYPE_DEBUG, " POLL FWD canceled\n"); | 2827 | LOG (GNUNET_ERROR_TYPE_DEBUG, " POLL task FWD canceled\n"); |
2828 | } | 2828 | } |
2829 | if (NULL != c->bck_fc.poll_task) | 2829 | if (NULL != c->bck_fc.poll_task) |
2830 | { | 2830 | { |
2831 | GNUNET_SCHEDULER_cancel (c->bck_fc.poll_task); | 2831 | GNUNET_SCHEDULER_cancel (c->bck_fc.poll_task); |
2832 | LOG (GNUNET_ERROR_TYPE_DEBUG, " POLL BCK canceled\n"); | 2832 | LOG (GNUNET_ERROR_TYPE_DEBUG, " POLL task BCK canceled\n"); |
2833 | } | 2833 | } |
2834 | 2834 | ||
2835 | GNUNET_break (GNUNET_YES == | 2835 | GNUNET_break (GNUNET_YES == |
@@ -3248,7 +3248,7 @@ GCC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
3248 | case GNUNET_MESSAGE_TYPE_CADET_POLL: | 3248 | case GNUNET_MESSAGE_TYPE_CADET_POLL: |
3249 | pmsg = (struct GNUNET_CADET_Poll *) data; | 3249 | pmsg = (struct GNUNET_CADET_Poll *) data; |
3250 | pmsg->cid = c->id; | 3250 | pmsg->cid = c->id; |
3251 | LOG (GNUNET_ERROR_TYPE_DEBUG, " poll %u\n", ntohl (pmsg->pid)); | 3251 | LOG (GNUNET_ERROR_TYPE_DEBUG, " POLL %u\n", ntohl (pmsg->pid)); |
3252 | droppable = GNUNET_NO; | 3252 | droppable = GNUNET_NO; |
3253 | break; | 3253 | break; |
3254 | 3254 | ||
@@ -3420,7 +3420,7 @@ GCC_start_poll (struct CadetConnection *c, int fwd) | |||
3420 | GC_f2s (fwd)); | 3420 | GC_f2s (fwd)); |
3421 | if (NULL != fc->poll_task || NULL != fc->poll_msg) | 3421 | if (NULL != fc->poll_task || NULL != fc->poll_msg) |
3422 | { | 3422 | { |
3423 | LOG (GNUNET_ERROR_TYPE_DEBUG, " not needed (%p, %p)\n", | 3423 | LOG (GNUNET_ERROR_TYPE_DEBUG, " POLL not needed (%p, %p)\n", |
3424 | fc->poll_task, fc->poll_msg); | 3424 | fc->poll_task, fc->poll_msg); |
3425 | return; | 3425 | return; |
3426 | } | 3426 | } |
@@ -3516,7 +3516,7 @@ GCC_debug (const struct CadetConnection *c, enum GNUNET_ErrorType level) | |||
3516 | LOG2 (level, "CCC last ACK sent: %5u, recv: %5u\n", | 3516 | LOG2 (level, "CCC last ACK sent: %5u, recv: %5u\n", |
3517 | c->fwd_fc.last_ack_sent, c->fwd_fc.last_ack_recv); | 3517 | c->fwd_fc.last_ack_sent, c->fwd_fc.last_ack_recv); |
3518 | LOG2 (level, "CCC recv PID bitmap: %X\n", c->fwd_fc.recv_bitmap); | 3518 | LOG2 (level, "CCC recv PID bitmap: %X\n", c->fwd_fc.recv_bitmap); |
3519 | LOG2 (level, "CCC POLL: task %d, msg %p, msg_ack %p)\n", | 3519 | LOG2 (level, "CCC poll: task %d, msg %p, msg_ack %p)\n", |
3520 | c->fwd_fc.poll_task, c->fwd_fc.poll_msg, c->fwd_fc.ack_msg); | 3520 | c->fwd_fc.poll_task, c->fwd_fc.poll_msg, c->fwd_fc.ack_msg); |
3521 | 3521 | ||
3522 | LOG2 (level, "CCC BCK flow control:\n"); | 3522 | LOG2 (level, "CCC BCK flow control:\n"); |
@@ -3526,7 +3526,7 @@ GCC_debug (const struct CadetConnection *c, enum GNUNET_ErrorType level) | |||
3526 | LOG2 (level, "CCC last ACK sent: %5u, recv: %5u\n", | 3526 | LOG2 (level, "CCC last ACK sent: %5u, recv: %5u\n", |
3527 | c->bck_fc.last_ack_sent, c->bck_fc.last_ack_recv); | 3527 | c->bck_fc.last_ack_sent, c->bck_fc.last_ack_recv); |
3528 | LOG2 (level, "CCC recv PID bitmap: %X\n", c->bck_fc.recv_bitmap); | 3528 | LOG2 (level, "CCC recv PID bitmap: %X\n", c->bck_fc.recv_bitmap); |
3529 | LOG2 (level, "CCC POLL: task %d, msg %p, msg_ack %p)\n", | 3529 | LOG2 (level, "CCC poll: task %d, msg %p, msg_ack %p)\n", |
3530 | c->bck_fc.poll_task, c->bck_fc.poll_msg, c->bck_fc.ack_msg); | 3530 | c->bck_fc.poll_task, c->bck_fc.poll_msg, c->bck_fc.ack_msg); |
3531 | 3531 | ||
3532 | LOG2 (level, "CCC DEBUG CONNECTION END\n"); | 3532 | LOG2 (level, "CCC DEBUG CONNECTION END\n"); |