Commit 2c27cfc3 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

save 3-7 bytes per edge connection


svn:r7044
parent 2dc9066f
...@@ -417,7 +417,8 @@ connection_ap_expire_beginning(void) ...@@ -417,7 +417,8 @@ connection_ap_expire_beginning(void)
circ->timestamp_dirty -= options->MaxCircuitDirtiness; circ->timestamp_dirty -= options->MaxCircuitDirtiness;
/* give our stream another 'cutoff' seconds to try */ /* give our stream another 'cutoff' seconds to try */
conn->_base.timestamp_lastread += cutoff; conn->_base.timestamp_lastread += cutoff;
conn->num_socks_retries++; if (conn->num_socks_retries < 250) /* avoid overflow */
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, TO_ORIGIN_CIRCUIT(circ))<0) { if (connection_ap_detach_retriable(conn, TO_ORIGIN_CIRCUIT(circ))<0) {
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
......
...@@ -713,7 +713,7 @@ typedef struct edge_connection_t { ...@@ -713,7 +713,7 @@ typedef struct edge_connection_t {
/** Number of times we've reassigned this application connection to /** Number of times we've reassigned this application connection to
* a new circuit. We keep track because the timeout is longer if we've * a new circuit. We keep track because the timeout is longer if we've
* already retried several times. */ * already retried several times. */
int num_socks_retries; uint8_t num_socks_retries;
/** Nickname of planned exit node -- used with .exit support. */ /** Nickname of planned exit node -- used with .exit support. */
char *chosen_exit_name; char *chosen_exit_name;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment