nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Define a schedule for how long to wait between retrying

Browse Source 
application connections. Rather than waiting a fixed amount of
time between each retry, we wait only 5 seconds for the first,
10 seconds for the second, and 15 seconds for each retry after
that. Hopefully this will improve the expected experience.

Addresses bug 297.


svn:r6790
This commit is contained in:
Roger Dingledine 2006-07-18 04:42:32 +00:00
parent 1d02d24afa
commit 892f671f59
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/or/connection_edge.c
View File

@ -306,6 +306,21 @@ connection_edge_finished_connecting(connection_t *conn)
return connection_edge_process_inbuf(conn, 1); return connection_edge_process_inbuf(conn, 1);
} }
/** Define a schedule for how long to wait between retrying
* application connections. Rather than waiting a fixed amount of
* time between each retry, we wait only 5 seconds for the first,
* 10 seconds for the second, and 15 seconds for each retry after
* that. Hopefully this will improve the expected experience. */
static int
compute_socks_timeout(connection_t *conn)
{
if (conn->num_socks_retries == 0)
return 5;
if (conn->num_socks_retries == 1)
return 10;
return 15;
}
/** Find all general-purpose AP streams waiting for a response that sent their /** Find all general-purpose AP streams waiting for a response that sent their
* begin/resolve cell >=15 seconds ago. Detach from their current circuit, and * begin/resolve cell >=15 seconds ago. Detach from their current circuit, and
* mark their current circuit as unsuitable for new streams. Then call * mark their current circuit as unsuitable for new streams. Then call
@ -326,6 +341,7 @@ connection_ap_expire_beginning(void)
time_t now = time(NULL); time_t now = time(NULL);
or_options_t *options = get_options(); or_options_t *options = get_options();
int severity; int severity;
int cutoff;
get_connection_array(&carray, &n); get_connection_array(&carray, &n);
@ -343,10 +359,11 @@ connection_ap_expire_beginning(void)
continue; continue;
} }
else if (conn->state != AP_CONN_STATE_RESOLVE_WAIT && if (conn->state != AP_CONN_STATE_RESOLVE_WAIT &&
conn->state != AP_CONN_STATE_CONNECT_WAIT) conn->state != AP_CONN_STATE_CONNECT_WAIT)
continue; continue;
if (now - conn->timestamp_lastread < 15) cutoff = compute_socks_timeout(conn);
if (now - conn->timestamp_lastread < cutoff)
continue; continue;
circ = circuit_get_by_edge_conn(conn); circ = circuit_get_by_edge_conn(conn);
if (!circ) { /* it's vanished? */ if (!circ) { /* it's vanished? */
@ -385,8 +402,9 @@ connection_ap_expire_beginning(void)
* unattractive to use for new streams */ * unattractive to use for new streams */
tor_assert(circ->timestamp_dirty); tor_assert(circ->timestamp_dirty);
circ->timestamp_dirty -= options->MaxCircuitDirtiness; circ->timestamp_dirty -= options->MaxCircuitDirtiness;
/* give our stream another 15 seconds to try */ /* give our stream another 'cutoff' seconds to try */
conn->timestamp_lastread += 15; conn->timestamp_lastread += cutoff;
conn->num_socks_retries++;
/* move it back into 'pending' state, and try to attach. */ /* move it back into 'pending' state, and try to attach. */
if (connection_ap_detach_retriable(conn, circ)<0) { if (connection_ap_detach_retriable(conn, circ)<0) {
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);

4
src/or/or.h
View File

@ -658,6 +658,10 @@ struct connection_t {
char *chosen_exit_name; char *chosen_exit_name;
/** If 1, and we fail to reach the chosen exit, stop requiring it. */ /** If 1, and we fail to reach the chosen exit, stop requiring it. */
unsigned int chosen_exit_optional:1; unsigned int chosen_exit_optional:1;
/** Number of times we've reassigned this application connection to
* a new circuit. We keep track because the timeout is longer if we've
* already retried several times. */
int num_socks_retries;
/* Used only by OR connections: */ /* Used only by OR connections: */
tor_tls_t *tls; /**< TLS connection state (OR only.) */ tor_tls_t *tls; /**< TLS connection state (OR only.) */