diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-02 12:09:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-02 12:09:39 +0000 |
commit | 0ac0a301c63b5cb1fed345e620f9a106bcce9850 (patch) | |
tree | 6b786a52a4b1845f257ace68a7ea26d802149259 /src/transport/transport_api.c | |
parent | 89fcd331339e3bc2c0ce62a7765dac3f39cfff2a (diff) | |
download | gnunet-0ac0a301c63b5cb1fed345e620f9a106bcce9850.tar.gz gnunet-0ac0a301c63b5cb1fed345e620f9a106bcce9850.zip |
undo 17914, 915, 916
Diffstat (limited to 'src/transport/transport_api.c')
-rw-r--r-- | src/transport/transport_api.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 894618986..2ececc10d 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c | |||
@@ -681,7 +681,7 @@ transport_notify_ready (void *cls, size_t size, void *buf) | |||
681 | } | 681 | } |
682 | th = n->th; | 682 | th = n->th; |
683 | if (th->notify_size + sizeof (struct OutboundMessage) > size) | 683 | if (th->notify_size + sizeof (struct OutboundMessage) > size) |
684 | break; /* does not fit */ | 684 | break; /* does not fit */ |
685 | if (GNUNET_BANDWIDTH_tracker_get_delay | 685 | if (GNUNET_BANDWIDTH_tracker_get_delay |
686 | (&n->out_tracker, th->notify_size).rel_value > 0) | 686 | (&n->out_tracker, th->notify_size).rel_value > 0) |
687 | break; /* too early */ | 687 | break; /* too early */ |
@@ -708,8 +708,7 @@ transport_notify_ready (void *cls, size_t size, void *buf) | |||
708 | memcpy (&cbuf[ret], &obm, sizeof (struct OutboundMessage)); | 708 | memcpy (&cbuf[ret], &obm, sizeof (struct OutboundMessage)); |
709 | ret += (mret + sizeof (struct OutboundMessage)); | 709 | ret += (mret + sizeof (struct OutboundMessage)); |
710 | size -= (mret + sizeof (struct OutboundMessage)); | 710 | size -= (mret + sizeof (struct OutboundMessage)); |
711 | if (NULL == getenv ("infinitebandwidth")) | 711 | GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret); |
712 | GNUNET_BANDWIDTH_tracker_consume (&n->out_tracker, mret); | ||
713 | } | 712 | } |
714 | GNUNET_free (th); | 713 | GNUNET_free (th); |
715 | } | 714 | } |