diff options
author | David Goulet <dgoulet@torproject.org> | 2022-10-19 15:27:22 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2022-10-19 16:39:10 -0400 |
commit | 04cccd70744a09492b70baf974b2953d6e5c6d0a (patch) | |
tree | 64e61e303c847d50db6bb4e83ac5da7a08e03d02 /src/core | |
parent | 921268d4ce3e55c87e1df91a17b96d8d1407fbb7 (diff) | |
download | tor-04cccd70744a09492b70baf974b2953d6e5c6d0a.tar.gz tor-04cccd70744a09492b70baf974b2953d6e5c6d0a.zip |
hs: Retry service rendezvous on circuit close
Move the retry from circuit_expire_building() to when the offending
circuit is being closed.
Fixes #40695
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/or/circuituse.c | 1 | ||||
-rw-r--r-- | src/core/or/origin_circuit_st.h | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index acb9a7fba1..dbeea10821 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -759,7 +759,6 @@ circuit_expire_building(void) (unsigned)victim->n_circ_id, victim->state, circuit_state_to_string(victim->state), victim->purpose); - hs_circ_retry_service_rendezvous_point(TO_ORIGIN_CIRCUIT(victim)); /* We'll close as a timeout the victim circuit. The rendezvous point * won't keep both circuits, it only keeps the newest (for the same * cookie). */ diff --git a/src/core/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h index 2cd8a33abc..73b971f72d 100644 --- a/src/core/or/origin_circuit_st.h +++ b/src/core/or/origin_circuit_st.h @@ -209,14 +209,6 @@ struct origin_circuit_t { * no circuits have opened. Used to prevent spamming logs. */ unsigned int relaxed_timeout : 1; - /** Set iff this is a service-side rendezvous circuit for which a - * new connection attempt has been launched. We consider launching - * a new service-side rend circ to a client when the previous one - * fails; now that we don't necessarily close a service-side rend - * circ when we launch a new one to the same client, this flag keeps - * us from launching two retries for the same failed rend circ. */ - unsigned int hs_service_side_rend_circ_has_been_relaunched : 1; - /** What commands were sent over this circuit that decremented the * RELAY_EARLY counter? This is for debugging task 878. */ uint8_t relay_early_commands[MAX_RELAY_EARLY_CELLS_PER_CIRCUIT]; |