summaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-11-15 18:38:52 -0500
committerNick Mathewson <nickm@torproject.org>2013-11-15 18:38:52 -0500
commit91ec6f7269bd7a5b73629f38e9779e84a0fb84f2 (patch)
treeaa3a9530b77790cdb907358aeaa14f84f9ef5f84 /src/or/relay.c
parent9e907076025ccd91abfad7fc70c09ba4c9228f82 (diff)
downloadtor-91ec6f7269bd7a5b73629f38e9779e84a0fb84f2.tar.gz
tor-91ec6f7269bd7a5b73629f38e9779e84a0fb84f2.zip
Have the OOM handler also count the age the data in a stream buffer
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index a193ad8431..042fc18d11 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1998,6 +1998,7 @@ static int
cell_queues_check_size(void)
{
size_t alloc = total_cells_allocated * packed_cell_mem_cost();
+ alloc += buf_get_total_allocation();
if (alloc >= get_options()->MaxMemInCellQueues) {
circuits_handle_oom(alloc);
return 1;