October 2012 - tor-commits - lists.torproject.org

[tor/master] Adjust the circuitmux_t counter correctly in circuitmux_notify_xmit_cells()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 7598e669e866f2c1aa61e430c86a06f10dd03cc6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 10:58:27 2012 -0700 Adjust the circuitmux_t counter correctly in circuitmux_notify_xmit_cells() --- src/or/circuitmux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index b16eb63..fd59840 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -1324,6 +1324,8 @@ circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, hashent->muxinfo.cell_count -= n_cells; /* Do we need to make the circuit inactive? */ if (hashent->muxinfo.cell_count == 0) becomes_inactive = 1; + /* Adjust the mux cell counter */ + cmux->n_cells -= n_cells; /* If we aren't making it inactive later, move it to the tail of the list */ if (!becomes_inactive) {

1 0

[tor/master] Handle closing circuits correctly with circuitmux_t
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 3d092ffbdd023a2be0307cb8a52bd48e2c85b257 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 13:06:10 2012 -0700 Handle closing circuits correctly with circuitmux_t --- src/or/circuitlist.c | 17 +++++--- src/or/circuitmux.c | 102 ++++++++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 51 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index a4dcec6..a87f989 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -131,11 +131,12 @@ circuit_set_circid_chan_helper(circuit_t *circ, int direction, if (old_chan) { /* * If we're changing channels or ID and had an old channel and a non - * zero old ID (i.e., we should have been attached), detach the circuit. - * ID changes require this because circuitmux hashes on (channel_id, - * circuit_id). + * zero old ID and weren't marked for close (i.e., we should have been + * attached), detach the circuit. ID changes require this because + * circuitmux hashes on (channel_id, circuit_id). */ - if (id != 0 && (old_chan != chan || old_id != id)) { + if (id != 0 && (old_chan != chan || old_id != id) && + !(circ->marked_for_close)) { tor_assert(old_chan->cmux); circuitmux_detach_circuit(old_chan->cmux, circ); } @@ -180,9 +181,11 @@ circuit_set_circid_chan_helper(circuit_t *circ, int direction, /* * Attach to the circuitmux if we're changing channels or IDs and - * have a new channel and ID to use. + * have a new channel and ID to use and the circuit is not marked for + * close. */ - if (chan && id != 0 && (old_chan != chan || old_id != id)) { + if (chan && id != 0 && (old_chan != chan || old_id != id) && + !(circ->marked_for_close)) { tor_assert(chan->cmux); circuitmux_attach_circuit(chan->cmux, circ, direction); attached = 1; @@ -1398,6 +1401,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, if (circ->n_chan) { circuit_clear_cell_queue(circ, circ->n_chan); channel_send_destroy(circ->n_circ_id, circ->n_chan, reason); + circuitmux_detach_circuit(circ->n_chan->cmux, circ); } if (! CIRCUIT_IS_ORIGIN(circ)) { @@ -1425,6 +1429,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, if (or_circ->p_chan) { circuit_clear_cell_queue(circ, or_circ->p_chan); channel_send_destroy(or_circ->p_circ_id, or_circ->p_chan, reason); + circuitmux_detach_circuit(or_circ->p_chan->cmux, circ); } } else { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 2bf511f..48336d8 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -130,6 +130,8 @@ struct chanid_circid_muxinfo_t { * Internal-use #defines */ +#define CMUX_PARANOIA + #ifdef CMUX_PARANOIA #define circuitmux_assert_okay_paranoid(cmux) \ circuitmux_assert_okay(cmux) @@ -1476,53 +1478,63 @@ circuitmux_assert_okay_pass_one(circuitmux_t *cmux) chan = channel_find_by_global_id(chan_id); tor_assert(chan); circ = circuit_get_by_circid_channel(circ_id, chan); - tor_assert(circ); - - /* Clear the circ_is_active bit to start */ - circ_is_active = 0; - - /* Assert that we know which direction this is going */ - tor_assert((*i)->muxinfo.direction == CELL_DIRECTION_OUT || - (*i)->muxinfo.direction == CELL_DIRECTION_IN); - - if ((*i)->muxinfo.direction == CELL_DIRECTION_OUT) { - /* We should be n_mux on this circuit */ - tor_assert(cmux == circ->n_mux); - tor_assert(chan == circ->n_chan); - /* Get next and prev for next test */ - next_p = &(circ->next_active_on_n_chan); - prev_p = &(circ->prev_active_on_n_chan); - } else { - /* This should be an or_circuit_t and we should be p_mux */ - or_circ = TO_OR_CIRCUIT(circ); - tor_assert(cmux == or_circ->p_mux); - tor_assert(chan == or_circ->p_chan); - /* Get next and prev for next test */ - next_p = &(or_circ->next_active_on_p_chan); - prev_p = &(or_circ->prev_active_on_p_chan); - } + if (circ) { + /* Clear the circ_is_active bit to start */ + circ_is_active = 0; + + /* Assert that we know which direction this is going */ + tor_assert((*i)->muxinfo.direction == CELL_DIRECTION_OUT || + (*i)->muxinfo.direction == CELL_DIRECTION_IN); + + if ((*i)->muxinfo.direction == CELL_DIRECTION_OUT) { + /* We should be n_mux on this circuit */ + tor_assert(cmux == circ->n_mux); + tor_assert(chan == circ->n_chan); + /* Get next and prev for next test */ + next_p = &(circ->next_active_on_n_chan); + prev_p = &(circ->prev_active_on_n_chan); + } else { + /* This should be an or_circuit_t and we should be p_mux */ + or_circ = TO_OR_CIRCUIT(circ); + tor_assert(cmux == or_circ->p_mux); + tor_assert(chan == or_circ->p_chan); + /* Get next and prev for next test */ + next_p = &(or_circ->next_active_on_p_chan); + prev_p = &(or_circ->prev_active_on_p_chan); + } - /* - * Should this circuit be active? I.e., does the mux know about > 0 - * cells on it? - */ - circ_is_active = ((*i)->muxinfo.cell_count > 0); - - /* It should be in the linked list iff it's active */ - if (circ_is_active) { - /* Either we have a next link or we are the tail */ - tor_assert(*next_p || (circ == cmux->active_circuits_tail)); - /* Either we have a prev link or we are the head */ - tor_assert(*prev_p || (circ == cmux->active_circuits_head)); - /* Increment the active circuits counter */ - ++n_active_circuits; + /* + * Should this circuit be active? I.e., does the mux know about > 0 + * cells on it? + */ + circ_is_active = ((*i)->muxinfo.cell_count > 0); + + /* It should be in the linked list iff it's active */ + if (circ_is_active) { + /* Either we have a next link or we are the tail */ + tor_assert(*next_p || (circ == cmux->active_circuits_tail)); + /* Either we have a prev link or we are the head */ + tor_assert(*prev_p || (circ == cmux->active_circuits_head)); + /* Increment the active circuits counter */ + ++n_active_circuits; + } else { + /* Shouldn't be in list, so no next or prev link */ + tor_assert(!(*next_p)); + tor_assert(!(*prev_p)); + /* And can't be head or tail */ + tor_assert(circ != cmux->active_circuits_head); + tor_assert(circ != cmux->active_circuits_tail); + } } else { - /* Shouldn't be in list, so no next or prev link */ - tor_assert(!(*next_p)); - tor_assert(!(*prev_p)); - /* And can't be head or tail */ - tor_assert(circ != cmux->active_circuits_head); - tor_assert(circ != cmux->active_circuits_tail); + /* + * circuit_get_by_circid_channel() doesn't want us to have a circuit + * that's marked for close, but we can test for that case with + * circuit_id_in_use_on_channel(). Assert if it really, really isn't + * there. + */ + tor_assert(circuit_id_in_use_on_channel(circ_id, chan)); + /* It definitely isn't active */ + circ_is_active = 0; } /* Increment the circuits counter */

1 0

[tor/master] Add a bunch of paranoid-mode expensive asserts incircuitmux.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 6830c9c232ff8d93461d18aa4fc729861804e00e Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 12:01:05 2012 -0700 Add a bunch of paranoid-mode expensive asserts incircuitmux.c --- src/or/circuitmux.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index fd59840..2bf511f 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -127,6 +127,17 @@ struct chanid_circid_muxinfo_t { }; /* + * Internal-use #defines + */ + +#ifdef CMUX_PARANOIA +#define circuitmux_assert_okay_paranoid(cmux) \ + circuitmux_assert_okay(cmux) +#else +#define circuitmux_assert_okay_paranoid(cmux) +#endif + +/* * Static function declarations */ @@ -176,6 +187,8 @@ circuitmux_move_active_circ_to_tail(circuitmux_t *cmux, circuit_t *circ, tor_assert(cmux); tor_assert(circ); + circuitmux_assert_okay_paranoid(cmux); + /* Figure out our next_p and prev_p for this cmux/direction */ if (direction) { if (direction == CELL_DIRECTION_OUT) { @@ -229,6 +242,8 @@ circuitmux_move_active_circ_to_tail(circuitmux_t *cmux, circuit_t *circ, *prev_p = cmux->active_circuits_tail; /* Set the tail to this circuit */ cmux->active_circuits_tail = circ; + + circuitmux_assert_okay_paranoid(cmux); } static INLINE circuit_t ** @@ -324,6 +339,7 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) circuit_t *circ = NULL; tor_assert(cmux); + circuitmux_assert_okay_paranoid(cmux); i = HT_START(chanid_circid_muxinfo_map, cmux->chanid_circid_map); while (i) { @@ -794,6 +810,7 @@ circuitmux_attach_circuit(circuitmux_t *cmux, circuit_t *circ, tor_assert(circ); tor_assert(direction == CELL_DIRECTION_IN || direction == CELL_DIRECTION_OUT); + circuitmux_assert_okay_paranoid(cmux); /* * Figure out which channel we're using, and get the circuit's current @@ -919,6 +936,8 @@ circuitmux_attach_circuit(circuitmux_t *cmux, circuit_t *circ, } cmux->n_cells += cell_count; } + + circuitmux_assert_okay_paranoid(cmux); } /** @@ -940,6 +959,7 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) tor_assert(cmux->chanid_circid_map); tor_assert(circ); tor_assert(circ->n_chan); + circuitmux_assert_okay_paranoid(cmux); /* See if we have it for n_chan/n_circ_id */ search.chan_id = circ->n_chan->global_identifier; @@ -995,6 +1015,8 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) /* Free the hash entry */ tor_free(hashent); } + + circuitmux_assert_okay_paranoid(cmux); } /** @@ -1017,6 +1039,11 @@ circuitmux_make_circuit_active(circuitmux_t *cmux, circuit_t *circ, tor_assert(circ); tor_assert(direction == CELL_DIRECTION_OUT || direction == CELL_DIRECTION_IN); + /* + * Don't circuitmux_assert_okay_paranoid(cmux) here because the cell count + * already got changed and we have to update the list for it to be consistent + * again. + */ /* Get the right set of active list links for this direction */ if (direction == CELL_DIRECTION_OUT) { @@ -1084,6 +1111,8 @@ circuitmux_make_circuit_active(circuitmux_t *cmux, circuit_t *circ, cmux->policy->notify_circ_active(cmux, cmux->policy_data, circ, hashent->muxinfo.policy_data); } + + circuitmux_assert_okay_paranoid(cmux); } /** @@ -1107,6 +1136,11 @@ circuitmux_make_circuit_inactive(circuitmux_t *cmux, circuit_t *circ, tor_assert(circ); tor_assert(direction == CELL_DIRECTION_OUT || direction == CELL_DIRECTION_IN); + /* + * Don't circuitmux_assert_okay_paranoid(cmux) here because the cell count + * already got changed and we have to update the list for it to be consistent + * again. + */ /* Get the right set of active list links for this direction */ if (direction == CELL_DIRECTION_OUT) { @@ -1191,6 +1225,8 @@ circuitmux_make_circuit_inactive(circuitmux_t *cmux, circuit_t *circ, cmux->policy->notify_circ_inactive(cmux, cmux->policy_data, circ, hashent->muxinfo.policy_data); } + + circuitmux_assert_okay_paranoid(cmux); } /** @@ -1217,6 +1253,8 @@ circuitmux_set_num_cells(circuitmux_t *cmux, circuit_t *circ, tor_assert(cmux); tor_assert(circ); + circuitmux_assert_okay_paranoid(cmux); + /* Search for this circuit's entry */ hashent = circuitmux_find_map_entry(cmux, circ); /* Assert that we found one */ @@ -1242,15 +1280,22 @@ circuitmux_set_num_cells(circuitmux_t *cmux, circuit_t *circ, */ if (hashent->muxinfo.cell_count > 0 && n_cells == 0) { --(cmux->n_active_circuits); + hashent->muxinfo.cell_count = n_cells; circuitmux_make_circuit_inactive(cmux, circ, hashent->muxinfo.direction); /* Is the old cell count == 0 and the new cell count > 0 ? */ } else if (hashent->muxinfo.cell_count == 0 && n_cells > 0) { ++(cmux->n_active_circuits); + hashent->muxinfo.cell_count = n_cells; circuitmux_make_circuit_active(cmux, circ, hashent->muxinfo.direction); + } else { + /* + * Update the entry cell count like this so we can put a + * circuitmux_assert_okay_paranoid inside make_circuit_(in)active() too. + */ + hashent->muxinfo.cell_count = n_cells; } - /* Update hash entry cell counter */ - hashent->muxinfo.cell_count = n_cells; + circuitmux_assert_okay_paranoid(cmux); } /* @@ -1301,6 +1346,7 @@ circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, tor_assert(cmux); tor_assert(circ); + circuitmux_assert_okay_paranoid(cmux); if (n_cells == 0) return; @@ -1351,6 +1397,8 @@ circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, --(cmux->n_active_circuits); circuitmux_make_circuit_inactive(cmux, circ, hashent->muxinfo.direction); } + + circuitmux_assert_okay_paranoid(cmux); } /*

1 0

[tor/master] Fix detach when setting circuit ID to 0 bug in circuit_set_circid_chan_helper() and add circuit_get_by_circid_channel_even_if_marked()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit b28119e6a86fb910c02f53ee5e0154f8d15dc1e4 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 14:22:53 2012 -0700 Fix detach when setting circuit ID to 0 bug in circuit_set_circid_chan_helper() and add circuit_get_by_circid_channel_even_if_marked() --- src/or/circuitlist.c | 14 +++++++++++++- src/or/circuitlist.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index a87f989..5140600 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -135,7 +135,7 @@ circuit_set_circid_chan_helper(circuit_t *circ, int direction, * attached), detach the circuit. ID changes require this because * circuitmux hashes on (channel_id, circuit_id). */ - if (id != 0 && (old_chan != chan || old_id != id) && + if (old_id != 0 && (old_chan != chan || old_id != id) && !(circ->marked_for_close)) { tor_assert(old_chan->cmux); circuitmux_detach_circuit(old_chan->cmux, circ); @@ -986,6 +986,18 @@ circuit_get_by_circid_channel(circid_t circ_id, channel_t *chan) return circ; } +/** Return a circ such that: + * - circ-\>n_circ_id or circ-\>p_circ_id is equal to circ_id, and + * - circ is attached to chan, either as p_chan or n_chan. + * Return NULL if no such circuit exists. + */ +circuit_t * +circuit_get_by_circid_channel_even_if_marked(circid_t circ_id, + channel_t *chan) +{ + return circuit_get_by_circid_channel_impl(circ_id, chan); +} + /** Return true iff the circuit ID circ_id is currently used by a * circuit, marked or not, on chan. */ int diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index f0f4b2a..89e957c 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -30,6 +30,9 @@ origin_circuit_t *origin_circuit_new(void); or_circuit_t *or_circuit_new(circid_t p_circ_id, channel_t *p_chan); circuit_t *circuit_get_by_circid_channel(circid_t circ_id, channel_t *chan); +circuit_t * +circuit_get_by_circid_channel_even_if_marked(circid_t circ_id, + channel_t *chan); int circuit_id_in_use_on_channel(circid_t circ_id, channel_t *chan); circuit_t *circuit_get_by_edge_conn(edge_connection_t *conn); void circuit_unlink_all_from_channel(channel_t *chan, int reason);

1 0

[tor/master] Detach circuits from circuitmux early when freeing channel so they can find the channel by ID
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit c097fb33fc081165a55f0b9417d7c8bf5dc91cd6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 14:22:04 2012 -0700 Detach circuits from circuitmux early when freeing channel so they can find the channel by ID --- src/or/channel.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 8241556..4ad5bf1 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2766,6 +2766,10 @@ channel_free_list(smartlist_t *channels, int mark_for_close) "in state %s (%d)", curr, U64_PRINTF_ARG(curr->global_identifier), channel_state_to_string(curr->state), curr->state); + /* Detach circuits early so they can find the channel */ + if (curr->cmux) { + circuitmux_detach_all_circuits(curr->cmux); + } channel_unregister(curr); if (mark_for_close) { if (!(curr->state == CHANNEL_STATE_CLOSING ||

1 0

[tor/master] Fix some circuitmux-related asserts in relay.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 1498a6e84a871b2d1b05ab64e2a564a23e03e668 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 14:24:08 2012 -0700 Fix some circuitmux-related asserts in relay.c --- src/or/relay.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index d034162..7c81273 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1779,7 +1779,7 @@ circuit_consider_sending_sendme(circuit_t *circ, crypt_path_t *layer_hint) #ifdef ACTIVE_CIRCUITS_PARANOIA #define assert_cmux_ok_paranoid(chan) \ - assert_cmux_okay(chan) + assert_circuit_mux_okay(chan) #else #define assert_cmux_ok_paranoid(chan) #endif @@ -2117,6 +2117,9 @@ channel_flush_from_first_active_circuit(channel_t *chan, int max) streams_blocked = circ->streams_blocked_on_p_chan; } + /* Circuitmux told us this was active, so it should have cells */ + tor_assert(queue->n > 0); + /* * Get just one cell here; once we've sent it, that can change the circuit * selection, so we have to loop around for another even if this circuit

1 0

[tor/master] Fix broken circuitmux_move_active_circ_to_tail(); don't assume n_chan is not NULL in circuitmux_detach_circuit()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 13972aee78542f654bcbbdaf09a49df9fed75738 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 17:33:41 2012 -0700 Fix broken circuitmux_move_active_circ_to_tail(); don't assume n_chan is not NULL in circuitmux_detach_circuit() --- src/or/circuitmux.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index b782fdb..d4ea643 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -182,6 +182,7 @@ circuitmux_move_active_circ_to_tail(circuitmux_t *cmux, circuit_t *circ, { circuit_t **next_p = NULL, **prev_p = NULL; circuit_t **next_prev = NULL, **prev_next = NULL; + circuit_t **tail_next = NULL; or_circuit_t *or_circ = NULL; tor_assert(cmux); @@ -237,9 +238,18 @@ circuitmux_move_active_circ_to_tail(circuitmux_t *cmux, circuit_t *circ, else cmux->active_circuits_head = *next_p; /* Adjust the next node's previous pointer, if any */ if (next_prev) *next_prev = *prev_p; + /* We're out of the list; now re-attach at the tail */ /* Adjust our next and prev pointers */ *next_p = NULL; *prev_p = cmux->active_circuits_tail; + /* Set the next pointer of the tail, or the head if none */ + if (cmux->active_circuits_tail) { + tail_next = circuitmux_next_active_circ_p(cmux, + cmux->active_circuits_tail); + *tail_next = circ; + } else { + cmux->active_circuits_head = circ; + } /* Set the tail to this circuit */ cmux->active_circuits_tail = circ; @@ -966,15 +976,16 @@ circuitmux_detach_circuit(circuitmux_t *cmux, circuit_t *circ) tor_assert(cmux); tor_assert(cmux->chanid_circid_map); tor_assert(circ); - tor_assert(circ->n_chan); circuitmux_assert_okay_paranoid(cmux); /* See if we have it for n_chan/n_circ_id */ - search.chan_id = circ->n_chan->global_identifier; - search.circ_id = circ->n_circ_id; - hashent = HT_REMOVE(chanid_circid_muxinfo_map, cmux->chanid_circid_map, - &search); - last_searched_direction = CELL_DIRECTION_OUT; + if (circ->n_chan) { + search.chan_id = circ->n_chan->global_identifier; + search.circ_id = circ->n_circ_id; + hashent = HT_REMOVE(chanid_circid_muxinfo_map, cmux->chanid_circid_map, + &search); + last_searched_direction = CELL_DIRECTION_OUT; + } /* Got one? If not, see if it's an or_circuit_t and try p_chan/p_circ_id */ if (!hashent) {

1 0

[tor/master] Allow n_chan to be NULL in circuitmux_find_map_entry(); it can be but with non-NULL p_chan when extending a circuit
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 903cc8acd12ae2484ba2ad2a7ac1cb1b9bb88638 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 14:55:33 2012 -0700 Allow n_chan to be NULL in circuitmux_find_map_entry(); it can be but with non-NULL p_chan when extending a circuit --- src/or/circuitmux.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index e27a790..b782fdb 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -655,15 +655,17 @@ circuitmux_find_map_entry(circuitmux_t *cmux, circuit_t *circ) tor_assert(cmux); tor_assert(cmux->chanid_circid_map); tor_assert(circ); - tor_assert(circ->n_chan); - /* Okay, let's see if it's attached for n_chan/n_circ_id */ - search.chan_id = circ->n_chan->global_identifier; - search.circ_id = circ->n_circ_id; + /* Check if we have n_chan */ + if (circ->n_chan) { + /* Okay, let's see if it's attached for n_chan/n_circ_id */ + search.chan_id = circ->n_chan->global_identifier; + search.circ_id = circ->n_circ_id; - /* Query */ - hashent = HT_FIND(chanid_circid_muxinfo_map, cmux->chanid_circid_map, - &search); + /* Query */ + hashent = HT_FIND(chanid_circid_muxinfo_map, cmux->chanid_circid_map, + &search); + } /* Found something? */ if (hashent) {

1 0

[tor/master] Implement channel_set_cmux_policy_everywhere()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 8afe41b481caa984fa6b4a0fbbf626d4cd22ce59 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 20:05:03 2012 -0700 Implement channel_set_cmux_policy_everywhere() --- src/or/channel.c | 16 ++++++++++++++++ src/or/channel.h | 3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 4ad5bf1..880fa63 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2696,6 +2696,22 @@ channel_listener_dumpstats(int severity) } /** + * Set the cmux policy on all active channels + */ + +void +channel_set_cmux_policy_everywhere(circuitmux_policy_t *pol) +{ + if (!active_channels) return; + + SMARTLIST_FOREACH_BEGIN(active_channels, channel_t *, curr) { + if (curr->cmux) { + circuitmux_set_policy(curr->cmux, pol); + } + } SMARTLIST_FOREACH_END(curr); +} + +/** * Clean up channels * * This gets called periodically from run_scheduled_events() in main.c; diff --git a/src/or/channel.h b/src/or/channel.h index 4d3db41..cb9835a 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -291,6 +291,9 @@ void channel_free_all(void); void channel_dumpstats(int severity); void channel_listener_dumpstats(int severity); +/* Set the cmux policy on all active channels */ +void channel_set_cmux_policy_everywhere(circuitmux_policy_t *pol); + #ifdef _TOR_CHANNEL_INTERNAL /* Channel operations for subclasses and internal use only */

1 0

[tor/master] Use circuit_get_by_circid_channel_even_if_marked() and fix some asserts in circuitmux.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit a0200c1f6e5b85a70a3f2bdc16bd7dd8b50eeb30 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 1 14:25:52 2012 -0700 Use circuit_get_by_circid_channel_even_if_marked() and fix some asserts in circuitmux.c --- src/or/circuitmux.c | 115 ++++++++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 61 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 48336d8..e27a790 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -130,8 +130,6 @@ struct chanid_circid_muxinfo_t { * Internal-use #defines */ -#define CMUX_PARANOIA - #ifdef CMUX_PARANOIA #define circuitmux_assert_okay_paranoid(cmux) \ circuitmux_assert_okay(cmux) @@ -341,7 +339,11 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) circuit_t *circ = NULL; tor_assert(cmux); - circuitmux_assert_okay_paranoid(cmux); + /* + * Don't circuitmux_assert_okay_paranoid() here; this gets called when + * channels are being freed and have already been unregistered, so + * the channel ID lookups it does will fail. + */ i = HT_START(chanid_circid_muxinfo_map, cmux->chanid_circid_map); while (i) { @@ -351,7 +353,9 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux) /* Find a channel and circuit */ chan = channel_find_by_global_id(to_remove->chan_id); if (chan) { - circ = circuit_get_by_circid_channel(to_remove->circ_id, chan); + circ = + circuit_get_by_circid_channel_even_if_marked(to_remove->circ_id, + chan); if (circ) { /* Clear the circuit's mux for this direction */ if (to_remove->muxinfo.direction == CELL_DIRECTION_OUT) { @@ -552,7 +556,7 @@ circuitmux_set_policy(circuitmux_t *cmux, tor_assert(chan); /* Get the circuit */ - circ = circuit_get_by_circid_channel((*i)->circ_id, chan); + circ = circuit_get_by_circid_channel_even_if_marked((*i)->circ_id, chan); tor_assert(circ); /* Need to tell old policy it becomes inactive (i.e., it is active) ? */ @@ -1477,64 +1481,53 @@ circuitmux_assert_okay_pass_one(circuitmux_t *cmux) /* Find the channel and circuit, assert that they exist */ chan = channel_find_by_global_id(chan_id); tor_assert(chan); - circ = circuit_get_by_circid_channel(circ_id, chan); - if (circ) { - /* Clear the circ_is_active bit to start */ - circ_is_active = 0; - - /* Assert that we know which direction this is going */ - tor_assert((*i)->muxinfo.direction == CELL_DIRECTION_OUT || - (*i)->muxinfo.direction == CELL_DIRECTION_IN); - - if ((*i)->muxinfo.direction == CELL_DIRECTION_OUT) { - /* We should be n_mux on this circuit */ - tor_assert(cmux == circ->n_mux); - tor_assert(chan == circ->n_chan); - /* Get next and prev for next test */ - next_p = &(circ->next_active_on_n_chan); - prev_p = &(circ->prev_active_on_n_chan); - } else { - /* This should be an or_circuit_t and we should be p_mux */ - or_circ = TO_OR_CIRCUIT(circ); - tor_assert(cmux == or_circ->p_mux); - tor_assert(chan == or_circ->p_chan); - /* Get next and prev for next test */ - next_p = &(or_circ->next_active_on_p_chan); - prev_p = &(or_circ->prev_active_on_p_chan); - } + circ = circuit_get_by_circid_channel_even_if_marked(circ_id, chan); + tor_assert(circ); + /* Clear the circ_is_active bit to start */ + circ_is_active = 0; + + /* Assert that we know which direction this is going */ + tor_assert((*i)->muxinfo.direction == CELL_DIRECTION_OUT || + (*i)->muxinfo.direction == CELL_DIRECTION_IN); + + if ((*i)->muxinfo.direction == CELL_DIRECTION_OUT) { + /* We should be n_mux on this circuit */ + tor_assert(cmux == circ->n_mux); + tor_assert(chan == circ->n_chan); + /* Get next and prev for next test */ + next_p = &(circ->next_active_on_n_chan); + prev_p = &(circ->prev_active_on_n_chan); + } else { + /* This should be an or_circuit_t and we should be p_mux */ + or_circ = TO_OR_CIRCUIT(circ); + tor_assert(cmux == or_circ->p_mux); + tor_assert(chan == or_circ->p_chan); + /* Get next and prev for next test */ + next_p = &(or_circ->next_active_on_p_chan); + prev_p = &(or_circ->prev_active_on_p_chan); + } - /* - * Should this circuit be active? I.e., does the mux know about > 0 - * cells on it? - */ - circ_is_active = ((*i)->muxinfo.cell_count > 0); - - /* It should be in the linked list iff it's active */ - if (circ_is_active) { - /* Either we have a next link or we are the tail */ - tor_assert(*next_p || (circ == cmux->active_circuits_tail)); - /* Either we have a prev link or we are the head */ - tor_assert(*prev_p || (circ == cmux->active_circuits_head)); - /* Increment the active circuits counter */ - ++n_active_circuits; - } else { - /* Shouldn't be in list, so no next or prev link */ - tor_assert(!(*next_p)); - tor_assert(!(*prev_p)); - /* And can't be head or tail */ - tor_assert(circ != cmux->active_circuits_head); - tor_assert(circ != cmux->active_circuits_tail); - } + /* + * Should this circuit be active? I.e., does the mux know about > 0 + * cells on it? + */ + circ_is_active = ((*i)->muxinfo.cell_count > 0); + + /* It should be in the linked list iff it's active */ + if (circ_is_active) { + /* Either we have a next link or we are the tail */ + tor_assert(*next_p || (circ == cmux->active_circuits_tail)); + /* Either we have a prev link or we are the head */ + tor_assert(*prev_p || (circ == cmux->active_circuits_head)); + /* Increment the active circuits counter */ + ++n_active_circuits; } else { - /* - * circuit_get_by_circid_channel() doesn't want us to have a circuit - * that's marked for close, but we can test for that case with - * circuit_id_in_use_on_channel(). Assert if it really, really isn't - * there. - */ - tor_assert(circuit_id_in_use_on_channel(circ_id, chan)); - /* It definitely isn't active */ - circ_is_active = 0; + /* Shouldn't be in list, so no next or prev link */ + tor_assert(!(*next_p)); + tor_assert(!(*prev_p)); + /* And can't be head or tail */ + tor_assert(circ != cmux->active_circuits_head); + tor_assert(circ != cmux->active_circuits_tail); } /* Increment the circuits counter */

1 0