summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2010-11-12 03:07:09 -0800
committerRobert Ransom <rransom.8774@gmail.com>2010-11-12 03:07:09 -0800
commita421e284d068955783fa30d6b7088d605b440ffd (patch)
tree5e4b67494d38e71142d8fdb41e37fd1592ecc132
parent81affe194905147f8e7692818dad786d3421f9a7 (diff)
downloadtor-a421e284d068955783fa30d6b7088d605b440ffd.tar.gz
tor-a421e284d068955783fa30d6b7088d605b440ffd.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 5b53d12f80..b96b82de5a 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -251,6 +251,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]);
@@ -296,6 +297,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