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

Merge remote-tracking branch 'public/bug11553_024' into bug11553_025

Browse Source 
Conflicts:
	src/or/circuitbuild.c
This commit is contained in:
Nick Mathewson 2014-04-23 12:44:18 -04:00
commit 17ad309d33
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/channel.c
View File

@ -728,6 +728,9 @@ channel_init(channel_t *chan)
/* Init timestamp */ /* Init timestamp */
chan->timestamp_last_added_nonpadding = time(NULL); chan->timestamp_last_added_nonpadding = time(NULL);
/* Warn about exhausted circuit IDs no more than hourly. */
chan->last_warned_circ_ids_exhausted.rate = 3600;
/* Initialize queues. */ /* Initialize queues. */
TOR_SIMPLEQ_INIT(&chan->incoming_queue); TOR_SIMPLEQ_INIT(&chan->incoming_queue);
TOR_SIMPLEQ_INIT(&chan->outgoing_queue); TOR_SIMPLEQ_INIT(&chan->outgoing_queue);

6
src/or/channel.h
View File

@ -149,8 +149,6 @@ struct channel_s {
circ_id_type_bitfield_t circ_id_type:2; circ_id_type_bitfield_t circ_id_type:2;
/** DOCDOC*/ /** DOCDOC*/
unsigned wide_circ_ids:1; unsigned wide_circ_ids:1;
/** Have we logged a warning about circID exhaustion on this channel? */
unsigned warned_circ_ids_exhausted:1;
/** For how many circuits are we n_chan? What about p_chan? */ /** For how many circuits are we n_chan? What about p_chan? */
unsigned int num_n_circuits, num_p_circuits; unsigned int num_n_circuits, num_p_circuits;
@ -179,6 +177,10 @@ struct channel_s {
*/ */
unsigned int is_local:1; unsigned int is_local:1;
/** Have we logged a warning about circID exhaustion on this channel?
* If so, when? */
ratelim_t last_warned_circ_ids_exhausted;
/** Channel timestamps for cell channels */ /** Channel timestamps for cell channels */
time_t timestamp_client; /* Client used this, according to relay.c */ time_t timestamp_client; /* Client used this, according to relay.c */
time_t timestamp_drained; /* Output queue empty */ time_t timestamp_drained; /* Output queue empty */

19
src/or/circuitbuild.c
View File

@ -87,6 +87,12 @@ channel_connect_for_circuit(const tor_addr_t *addr, uint16_t port,
static circid_t static circid_t
get_unique_circ_id_by_chan(channel_t *chan) get_unique_circ_id_by_chan(channel_t *chan)
{ {
/* This number is chosen somewhat arbitrarily; see comment below for more
* info. When the space is 80% full, it gives a one-in-a-million failure
* chance; when the space is 90% full, it gives a one-in-850 chance; and when
* the space is 95% full, it gives a one-in-26 failure chance. That seems
* okay, though you could make a case IMO for anything between N=32 and
* N=256. */
#define MAX_CIRCID_ATTEMPTS 64 #define MAX_CIRCID_ATTEMPTS 64
int in_use; int in_use;
unsigned n_with_circ = 0, n_pending_destroy = 0; unsigned n_with_circ = 0, n_pending_destroy = 0;
@ -123,9 +129,8 @@ get_unique_circ_id_by_chan(channel_t *chan)
* whole circuit ID space every time we extend a circuit, which is * whole circuit ID space every time we extend a circuit, which is
* not so great either. * not so great either.
*/ */
if (! chan->warned_circ_ids_exhausted) { log_fn_ratelim(&chan->last_warned_circ_ids_exhausted, LOG_WARN,
chan->warned_circ_ids_exhausted = 1; LD_CIRC,"No unused circIDs found on channel %s wide "
log_warn(LD_CIRC,"No unused circIDs found on channel %s wide "
"circID support, with %u inbound and %u outbound circuits. " "circID support, with %u inbound and %u outbound circuits. "
"Found %u circuit IDs in use by circuits, and %u with " "Found %u circuit IDs in use by circuits, and %u with "
"pending destroy cells." "pending destroy cells."
@ -133,12 +138,14 @@ get_unique_circ_id_by_chan(channel_t *chan)
chan->wide_circ_ids ? "with" : "without", chan->wide_circ_ids ? "with" : "without",
chan->num_p_circuits, chan->num_n_circuits, chan->num_p_circuits, chan->num_n_circuits,
n_with_circ, n_pending_destroy); n_with_circ, n_pending_destroy);
}
return 0; return 0;
} }
crypto_rand((char*) &test_circ_id, sizeof(test_circ_id)); do {
test_circ_id &= mask; crypto_rand((char*) &test_circ_id, sizeof(test_circ_id));
test_circ_id &= mask;
} while (test_circ_id == 0);
test_circ_id |= high_bit; test_circ_id |= high_bit;
in_use = circuit_id_in_use_on_channel(test_circ_id, chan); in_use = circuit_id_in_use_on_channel(test_circ_id, chan);