commit fbd243a1652d7d610e9c8e00901638662cbe34c5 Author: Robert Ransom rransom.8774@gmail.com Date: Thu Jan 12 19:20:52 2012 -0800

Don't crash when HS circs which have not yet found an OR conn time out

Fixes bug #4897, not yet in any release.

Using n_circ_id alone here (and below, when n_conn is NULL) really sucks, but that's a separate bug which will need a changes/ file. --- src/or/circuituse.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 14f4f47..de0aa7d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -537,9 +537,8 @@ circuit_expire_building(void) case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT: case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: /* If we have reached this line, we want to spare the circ for now. */ - log_info(LD_CIRC,"Marking circ %s:%d:%d (state %d:%s, purpose %d) " + log_info(LD_CIRC,"Marking circ %d (state %d:%s, purpose %d) " "as timed-out HS circ", - victim->n_conn->_base.address, victim->n_conn->_base.port, victim->n_circ_id, victim->state, circuit_state_to_string(victim->state), victim->purpose); @@ -556,9 +555,8 @@ circuit_expire_building(void) if (!(options->CloseHSServiceRendCircuitsImmediatelyOnTimeout) && !(TO_ORIGIN_CIRCUIT(victim)->hs_circ_has_timed_out) && victim->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { - log_info(LD_CIRC,"Marking circ %s:%d:%d (state %d:%s, purpose %d) " + log_info(LD_CIRC,"Marking circ %d (state %d:%s, purpose %d) " "as timed-out HS circ; relaunching rendezvous attempt.", - victim->n_conn->_base.address, victim->n_conn->_base.port, victim->n_circ_id, victim->state, circuit_state_to_string(victim->state), victim->purpose);