summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-02-21 10:08:14 -0500
committerNick Mathewson <nickm@torproject.org>2019-02-21 10:08:14 -0500
commit50626479183858d25d4e52b80b000dbb43097917 (patch)
treebbf76f604413014d4c28551bdfdf64a647044aab /src
parent508002a4c259cdfeca38ec15a726aa8a991a58da (diff)
parentbe84ed1a64ed7ce810bd3924fa96c2588b491ef5 (diff)
downloadtor-50626479183858d25d4e52b80b000dbb43097917.tar.gz
tor-50626479183858d25d4e52b80b000dbb43097917.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src')
-rw-r--r--src/or/scheduler_kist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c
index c6e9b72c48..af8ddccabd 100644
--- a/src/or/scheduler_kist.c
+++ b/src/or/scheduler_kist.c
@@ -278,7 +278,7 @@ update_socket_info_impl, (socket_table_ent_t *ent))
extra_space =
clamp_double_to_int64(
(ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) -
- ent->notsent;
+ ent->notsent - (int64_t)channel_outbuf_length((channel_t *) ent->chan);
if ((tcp_space + extra_space) < 0) {
/* This means that the "notsent" queue is just too big so we shouldn't put
* more in the kernel for now. */