summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2010-11-12 00:46:26 -0800
committerRobert Ransom <rransom.8774@gmail.com>2010-11-12 02:34:58 -0800
commit6a0657d4bbb23858c9a01d5fbc2a2efdfee3a590 (patch)
tree65b9cae253f526a047c4fbf3371c41bcd68422a5
parent6d2e02d79bf3cbd5d35fd65068485520cd6ef84b (diff)
downloadtor-6a0657d4bbb23858c9a01d5fbc2a2efdfee3a590.tar.gz
tor-6a0657d4bbb23858c9a01d5fbc2a2efdfee3a590.zip
Disable logging to control port connections in buf_shrink_freelists.
If buf_shrink_freelists calls log_warn for some reason, we don't want the log call itself to throw buf_shrink_freelists further off the rails.
-rw-r--r--src/or/buffers.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index e835c615ef..7c28dc1a47 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -262,6 +262,7 @@ buf_shrink_freelists(int free_all)
{
#ifdef ENABLE_BUF_FREELISTS
int i;
+ disable_control_logging();
for (i = 0; freelists[i].alloc_size; ++i) {
int slack = freelists[i].slack;
assert_freelist_ok(&freelists[i]);
@@ -317,6 +318,7 @@ buf_shrink_freelists(int free_all)
freelists[i].lowest_length = freelists[i].cur_length;
assert_freelist_ok(&freelists[i]);
}
+ enable_control_logging();
#else
(void) free_all;
#endif