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

Carefully increment failure counts when appropriate

Browse Source 
svn:r1530
This commit is contained in:
Nick Mathewson 2004-04-07 20:59:38 +00:00
parent 6480d9d049
commit 2633d353d7
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/or/circuit.c
View File

@ -14,7 +14,7 @@ static uint16_t get_unique_circ_id_by_conn(connection_t *conn, int circ_id_type)
static void circuit_rep_hist_note_result(circuit_t *circ); static void circuit_rep_hist_note_result(circuit_t *circ);
static void circuit_is_open(circuit_t *circ); static void circuit_is_open(circuit_t *circ);
static void circuit_failed(circuit_t *circ); static void circuit_build_failed(circuit_t *circ);
static circuit_t *circuit_establish_circuit(uint8_t purpose, const char *exit_nickname); static circuit_t *circuit_establish_circuit(uint8_t purpose, const char *exit_nickname);
unsigned long stats_n_relay_cells_relayed = 0; unsigned long stats_n_relay_cells_relayed = 0;
@ -854,7 +854,7 @@ int _circuit_mark_for_close(circuit_t *circ) {
* links worked and which didn't. * links worked and which didn't.
*/ */
if (circ->state != CIRCUIT_STATE_OPEN) { if (circ->state != CIRCUIT_STATE_OPEN) {
circuit_failed(circ); /* take actions if necessary */ circuit_build_failed(circ); /* take actions if necessary */
circuit_rep_hist_note_result(circ); circuit_rep_hist_note_result(circ);
} }
@ -1130,7 +1130,9 @@ static void circuit_is_open(circuit_t *circ) {
} }
} }
static void circuit_failed(circuit_t *circ) { /* Called whenever a circuit could not be successfully built.
*/
static void circuit_build_failed(circuit_t *circ) {
/* we should examine circ and see if it failed because of /* we should examine circ and see if it failed because of
* the last hop or an earlier hop. then use this info below. * the last hop or an earlier hop. then use this info below.
@ -1148,23 +1150,37 @@ static void circuit_failed(circuit_t *circ) {
break; break;
case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO:
/* at Bob, waiting for introductions */ /* at Bob, waiting for introductions */
if (circ->state != CIRCUIT_STATE_OPEN) {
circuit_increment_failure_count();
}
/* no need to care here, because bob will rebuild intro /* no need to care here, because bob will rebuild intro
* points periodically. */ * points periodically. */
break; break;
case CIRCUIT_PURPOSE_C_INTRODUCING: case CIRCUIT_PURPOSE_C_INTRODUCING:
/* at Alice, connecting to intro point */ /* at Alice, connecting to intro point */
/* Don't increment failure count, since Bob may have picked
* the inttroduction point badly */
/* Alice will pick a new intro point when this one dies, if /* Alice will pick a new intro point when this one dies, if
* the stream in question still cares. No need to act here. */ * the stream in question still cares. No need to act here. */
break; break;
case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
/* at Alice, waiting for Bob */ /* at Alice, waiting for Bob */
if (circ->state != CIRCUIT_STATE_OPEN) {
circuit_increment_failure_count();
}
/* Alice will pick a new rend point when this one dies, if /* Alice will pick a new rend point when this one dies, if
* the stream in question still cares. No need to act here. */ * the stream in question still cares. No need to act here. */
break; break;
case CIRCUIT_PURPOSE_S_CONNECT_REND: case CIRCUIT_PURPOSE_S_CONNECT_REND:
/* at Bob, connecting to rend point */ /* at Bob, connecting to rend point */
/* Don't increment failure count, since Alice may have picked
* the rendezvous point badly */
log_fn(LOG_INFO,"Couldn't connect to Alice's chosen rend point %s. Sucks to be Alice.", circ->build_state->chosen_exit); log_fn(LOG_INFO,"Couldn't connect to Alice's chosen rend point %s. Sucks to be Alice.", circ->build_state->chosen_exit);
break; break;
default:
/* Other cases are impossible, since this function is only caused with
* unbuilt circuits. */
assert(0);
} }
} }