nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

changes entry for bug 1741

Browse Source
This commit is contained in:
Roger Dingledine 2010-08-13 20:50:51 -04:00
parent 5b0c0e1f89
commit e50857b67f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ancient-nondirty-circuits Normal file
View File

@ -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.

5
src/or/circuituse.c
View File

@ -748,7 +748,8 @@ circuit_expire_old_circuits_clientside(time_t now)
} else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) {
/* Server side rend joined circuits can end up really old, because /* Server side rend joined circuits can end up really old, because
* they are reused by clients for longer than normal. The client * 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) { if (circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {
log_notice(LD_CIRC, log_notice(LD_CIRC,
"Ancient non-dirty circuit %d is still around after " "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, TO_ORIGIN_CIRCUIT(circ)->global_identifier,
(long)(now - circ->timestamp_created), (long)(now - circ->timestamp_created),
circ->purpose); 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; TO_ORIGIN_CIRCUIT(circ)->is_ancient = 1;
} }
} }