mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 02:09:24 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Robert Ransom 2012-01-12 19:20:52 -08:00
parent 411cf8f714
commit fbd243a165
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/circuituse.c
View File

@ -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);