From 54510d4d1a66d2dd9a618699bd2e51bf4ade4dea Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Tue, 1 Sep 2015 16:30:48 +0000 Subject: Add `KeepAliveIsolateSOCKSAuth` as a SOCKSPort option. This controls the circuit dirtyness reset behavior added for Tor Browser's user experience fix (#15482). Unlike previous iterations of this patch, the tunable actually works, and is documented. --- src/or/circuituse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/or/circuituse.c') diff --git a/src/or/circuituse.c b/src/or/circuituse.c index e10bb82641..00340fd689 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2284,11 +2284,11 @@ connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; - if (!circ->base_.timestamp_dirty) { - circ->base_.timestamp_dirty = approx_time(); - } else if ((conn->entry_cfg.isolation_flags & ISO_SOCKSAUTH) && - (conn->socks_request->usernamelen || - conn->socks_request->passwordlen)) { + if (!circ->base_.timestamp_dirty || + ((conn->entry_cfg.isolation_flags & ISO_SOCKSAUTH) && + (conn->entry_cfg.socks_iso_keep_alive) && + (conn->socks_request->usernamelen || + conn->socks_request->passwordlen))) { /* When stream isolation is in use and controlled by an application * we are willing to keep using the stream. */ circ->base_.timestamp_dirty = approx_time(); -- cgit v1.2.3-54-g00ecf