summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2016-11-04 09:47:21 +0000
committerBart Polot <bart@net.in.tum.de>2016-11-04 09:47:21 +0000
commit8894f42d840e62b2054e2ec9d3531639124dcf1c (patch)
tree91ef956d2319cc6580275f5ba5302b0d25ec7d39
parent435d615595069707ea77a5888486d5e863faba31 (diff)
downloadgnunet-8894f42d840e62b2054e2ec9d3531639124dcf1c.tar.gz
gnunet-8894f42d840e62b2054e2ec9d3531639124dcf1c.zip
- fix logging
-rw-r--r--src/cadet/gnunet-service-cadet_connection.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 6f186c82a..b65df9f4b 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -566,14 +566,14 @@ send_ack (struct CadetConnection *c, unsigned int buffer, int fwd, int force)
566 next_fc = fwd ? &c->fwd_fc : &c->bck_fc; 566 next_fc = fwd ? &c->fwd_fc : &c->bck_fc;
567 prev_fc = fwd ? &c->bck_fc : &c->fwd_fc; 567 prev_fc = fwd ? &c->bck_fc : &c->fwd_fc;
568 568
569 LOG (GNUNET_ERROR_TYPE_DEBUG, "connection send %s ack on %s\n", 569 LOG (GNUNET_ERROR_TYPE_DEBUG, "send %s ack on %s\n",
570 GC_f2s (fwd), GCC_2s (c)); 570 GC_f2s (fwd), GCC_2s (c));
571 571
572 /* Check if we need to transmit the ACK. */ 572 /* Check if we need to transmit the ACK. */
573 delta = prev_fc->last_ack_sent - prev_fc->last_pid_recv; 573 delta = prev_fc->last_ack_sent - prev_fc->last_pid_recv;
574 if (3 < delta && buffer < delta && GNUNET_NO == force) 574 if (3 < delta && buffer < delta && GNUNET_NO == force)
575 { 575 {
576 LOG (GNUNET_ERROR_TYPE_DEBUG, "Not sending ACK, buffer > 3\n"); 576 LOG (GNUNET_ERROR_TYPE_DEBUG, "Not sending ACK, delta > 3\n");
577 LOG (GNUNET_ERROR_TYPE_DEBUG, 577 LOG (GNUNET_ERROR_TYPE_DEBUG,
578 " last pid recv: %u, last ack sent: %u\n", 578 " last pid recv: %u, last ack sent: %u\n",
579 prev_fc->last_pid_recv, prev_fc->last_ack_sent); 579 prev_fc->last_pid_recv, prev_fc->last_ack_sent);
@@ -583,10 +583,9 @@ send_ack (struct CadetConnection *c, unsigned int buffer, int fwd, int force)
583 583
584 /* Ok, ACK might be necessary, what PID to ACK? */ 584 /* Ok, ACK might be necessary, what PID to ACK? */
585 ack = prev_fc->last_pid_recv + buffer; 585 ack = prev_fc->last_pid_recv + buffer;
586 LOG (GNUNET_ERROR_TYPE_DEBUG, " ACK %u\n", ack);
587 LOG (GNUNET_ERROR_TYPE_DEBUG, 586 LOG (GNUNET_ERROR_TYPE_DEBUG,
588 " last pid %u, last ack %u, qmax %u, q %u\n", 587 " ACK %u, last PID %u, last ACK %u, qmax %u, q %u\n",
589 prev_fc->last_pid_recv, prev_fc->last_ack_sent, 588 ack, prev_fc->last_pid_recv, prev_fc->last_ack_sent,
590 next_fc->queue_max, next_fc->queue_n); 589 next_fc->queue_max, next_fc->queue_n);
591 if (ack == prev_fc->last_ack_sent && GNUNET_NO == force) 590 if (ack == prev_fc->last_ack_sent && GNUNET_NO == force)
592 { 591 {