diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-20 08:39:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-20 08:39:39 -0500 |
| commit | 04812e59dfed3c6ea4ad376595dbc8e36aaf12d2 (patch) | |
| tree | 364d387813b0ccf4bc4cd77b1caf8746420eb196 /src | |
| parent | 2e590bac97b1b2009ea2bcf41a54cfa2dfc2b478 (diff) | |
| parent | e0f7a2dbd4365d453131732a668c1544962fcc0b (diff) | |
| download | tor-04812e59dfed3c6ea4ad376595dbc8e36aaf12d2.tar.gz tor-04812e59dfed3c6ea4ad376595dbc8e36aaf12d2.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuituse.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 62cc865f48..aa0df95652 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -543,8 +543,7 @@ circuit_expire_building(void) cutoff = begindir_cutoff; else if (victim->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) cutoff = close_cutoff; - else if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING || - victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) + else if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) cutoff = c_intro_cutoff; else if (victim->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) cutoff = s_intro_cutoff; @@ -661,12 +660,13 @@ circuit_expire_building(void) TO_ORIGIN_CIRCUIT(victim)->path_state = PATH_STATE_USE_FAILED; break; case CIRCUIT_PURPOSE_C_INTRODUCING: - /* We keep old introducing circuits around for - * a while in parallel, and they can end up "opened". - * We decide below if we're going to mark them timed - * out and eventually close them. - */ - break; + /* That purpose means that the intro point circuit has been opened + * succesfully but the INTRODUCE1 cell hasn't been sent yet because + * the client is waiting for the rendezvous point circuit to open. + * Keep this circuit open while waiting for the rendezvous circuit. + * We let the circuit idle timeout take care of cleaning this + * circuit if it never used. */ + continue; case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT: @@ -757,8 +757,6 @@ circuit_expire_building(void) NULL) break; /* fallthrough! */ - case CIRCUIT_PURPOSE_C_INTRODUCING: - /* connection_ap_handshake_attach_circuit() will relaunch for us */ 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. */ |