From e50857b67f23d06671d2856a04879c3425747adf Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Fri, 13 Aug 2010 20:50:51 -0400 Subject: [PATCH] changes entry for bug 1741 --- changes/ancient-nondirty-circuits | 4 ++++ src/or/circuituse.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changes/ancient-nondirty-circuits diff --git a/changes/ancient-nondirty-circuits b/changes/ancient-nondirty-circuits new file mode 100644 index 0000000000..9858cd1bb9 --- /dev/null +++ b/changes/ancient-nondirty-circuits @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix to remove a spurious hidden service server-side log notice about + "Ancient non-dirty circuits". Bugfix on 0.2.2.14-alpha; fixes + bug 1741. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 65ecb5433c..0429ca9cc9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -748,7 +748,8 @@ circuit_expire_old_circuits_clientside(time_t now) } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { /* Server side rend joined circuits can end up really old, because * they are reused by clients for longer than normal. The client - * controls their lifespan. */ + * controls their lifespan. (They never become dirty, because + * connection_exit_begin_conn() never marks anything as dirty.) */ if (circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) { log_notice(LD_CIRC, "Ancient non-dirty circuit %d is still around after " @@ -756,6 +757,8 @@ circuit_expire_old_circuits_clientside(time_t now) TO_ORIGIN_CIRCUIT(circ)->global_identifier, (long)(now - circ->timestamp_created), circ->purpose); + /* FFFF implement a new circuit_purpose_to_string() so we don't + * just print out a number for circ->purpose */ TO_ORIGIN_CIRCUIT(circ)->is_ancient = 1; } }