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

[tor/master] Make channel_force_free() static
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 8a41dd20cb43b16548b49f9eff581dba0ed9a9a1 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:10:13 2012 -0700 Make channel_force_free() static --- src/or/channel.c | 4 +++- src/or/channel.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 2ca9a13..469dc5d 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -86,6 +86,8 @@ static ssize_t channel_flush_some_cells_from_outgoing_queue(channel_t *chan, ssize_t num_cells); +static void channel_force_free(channel_t *chan); + /*********************************** * Channel state utility functions * **********************************/ @@ -753,7 +755,7 @@ channel_free(channel_t *chan) * it should only be used from channel_free_all() when shutting down. */ -void +static void channel_force_free(channel_t *chan) { tor_assert(chan); diff --git a/src/or/channel.h b/src/or/channel.h index fbcd38d..fac2b3b 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -285,7 +285,6 @@ void channel_closed(channel_t *chan); /* Free a channel */ void channel_free(channel_t *chan); -void channel_force_free(channel_t *chan); /* State/metadata setters */

1 0

[tor/master] Eliminate unnecessary channel_set_cell_handler(), channel_set_var_cell_handler() in channel.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit e877d02fdde73934e727346a9da11018681a4c14 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:06:40 2012 -0700 Eliminate unnecessary channel_set_cell_handler(), channel_set_var_cell_handler() in channel.c --- src/or/channel.c | 89 +----------------------------------------------------- src/or/channel.h | 5 --- 2 files changed, 1 insertions(+), 93 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index b3ab2f0..f987cae 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -916,50 +916,7 @@ void } /** - * Set the fixed-length cell handler for a channel - * - * This function sets the fixed-length cell handler for a channel and - * processes any incoming cells that had been blocked in the queue because - * none was available. - * - * @param chan Channel to set the fixed-length cell handler for - * @param cell_handler Function pointer to new fixed-length cell handler - */ - -void -channel_set_cell_handler(channel_t *chan, - void (*cell_handler)(channel_t *, cell_t *)) -{ - int changed = 0; - - tor_assert(chan); - tor_assert(!(chan->is_listener)); - tor_assert(chan->state == CHANNEL_STATE_OPENING || - chan->state == CHANNEL_STATE_OPEN || - chan->state == CHANNEL_STATE_MAINT); - - log_debug(LD_CHANNEL, - "Setting cell_handler callback for channel %p to %p", - chan, cell_handler); - - /* - * Keep track whether we've changed it so we know if there's any point in - * re-running the queue. - */ - if (cell_handler != chan->u.cell_chan.cell_handler) changed = 1; - - /* Change it */ - chan->u.cell_chan.cell_handler = cell_handler; - - /* Re-run the queue if we have one and there's any reason to */ - if (chan->u.cell_chan.cell_queue && - (smartlist_len(chan->u.cell_chan.cell_queue) > 0) && - changed && - chan->u.cell_chan.cell_handler) channel_process_cells(chan); -} - -/** - * Set the both cell handlers for a channel + * Set both cell handlers for a channel * * This function sets both the fixed-length and variable length cell handlers * for a channel and processes any incoming cells that had been blocked in the @@ -1011,50 +968,6 @@ channel_set_cell_handlers(channel_t *chan, } /** - * Set the variable-length cell handler for a channel - * - * This function sets the variable-length cell handler for a channel and - * processes any incoming cells that had been blocked in the queue because - * none was available. - * - * @param chan Channel to set the variable-length cell handler for - * @param cell_handler Function pointer to new variable-length cell handler - */ - -void -channel_set_var_cell_handler(channel_t *chan, - void (*var_cell_handler)(channel_t *, - var_cell_t *)) -{ - int changed = 0; - - tor_assert(chan); - tor_assert(!(chan->is_listener)); - tor_assert(chan->state == CHANNEL_STATE_OPENING || - chan->state == CHANNEL_STATE_OPEN || - chan->state == CHANNEL_STATE_MAINT); - - log_debug(LD_CHANNEL, - "Setting var_cell_handler callback for channel %p to %p", - chan, var_cell_handler); - - /* - * Keep track whether we've changed it so we know if there's any point in - * re-running the queue. - */ - if (var_cell_handler != chan->u.cell_chan.var_cell_handler) changed = 1; - - /* Change it */ - chan->u.cell_chan.var_cell_handler = var_cell_handler; - - /* Re-run the queue if we have one and there's any reason to */ - if (chan->u.cell_chan.cell_queue && - (smartlist_len(chan->u.cell_chan.cell_queue) > 0) && - changed && chan->u.cell_chan.var_cell_handler) - channel_process_cells(chan); -} - -/** * Request a channel be closed * * This function tries to close a channel_t; it will go into the CLOSING diff --git a/src/or/channel.h b/src/or/channel.h index 7075981..fbcd38d 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -247,15 +247,10 @@ void (* channel_get_cell_handler(channel_t *chan)) (channel_t *, cell_t *); void (* channel_get_var_cell_handler(channel_t *chan)) (channel_t *, var_cell_t *); -void channel_set_cell_handler(channel_t *chan, - void (*cell_handler)(channel_t *, cell_t *)); void channel_set_cell_handlers(channel_t *chan, void (*cell_handler)(channel_t *, cell_t *), void (*var_cell_handler)(channel_t *, var_cell_t *)); -void channel_set_var_cell_handler(channel_t *chan, - void (*var_cell_handler)(channel_t *, - var_cell_t *)); /* Clean up closed channels periodically; called from run_scheduled_events() * in main.c

1 0

[tor/master] Remove orphaned comment in channel_flush_some_cells_from_outgoing_queue()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit bb92a2d7a8560e7028faad024c3307080449aea4 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 19:54:47 2012 -0700 Remove orphaned comment in channel_flush_some_cells_from_outgoing_queue() --- src/or/channel.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index c5bf60d..114b5a8 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1847,7 +1847,6 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, /* Get the head of the queue */ q = smartlist_get(chan->u.cell_chan.outgoing_queue, 0); - /* That shouldn't happen; bail out */ if (q) { /* * Okay, we have a good queue entry, try to give it to the lower

1 0

[tor/master] Eliminate unnecessary SMARTLIST_DEL_CURRENT() invocations in channel.c, channeltls.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 17356fe7fd96af9285f8f9507b111373fd6fb891 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:02:42 2012 -0700 Eliminate unnecessary SMARTLIST_DEL_CURRENT() invocations in channel.c, channeltls.c --- src/or/channel.c | 88 ++++++++++++++++++--------------------------------- src/or/channeltls.c | 5 +-- 2 files changed, 32 insertions(+), 61 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 114b5a8..b3ab2f0 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -761,9 +761,6 @@ channel_free(channel_t *chan) void channel_force_free(channel_t *chan) { - cell_queue_entry_t *tmp = NULL; - channel_t *tmpchan = NULL; - tor_assert(chan); /* Call a free method if there is one */ @@ -778,9 +775,7 @@ channel_force_free(channel_t *chan) if (chan->u.listener.incoming_list) { SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list, channel_t *, qchan) { - tmpchan = qchan; - SMARTLIST_DEL_CURRENT(chan->u.listener.incoming_list, qchan); - channel_request_close(tmpchan); + channel_request_close(qchan); } SMARTLIST_FOREACH_END(qchan); smartlist_free(chan->u.listener.incoming_list); @@ -794,8 +789,6 @@ channel_force_free(channel_t *chan) if (chan->u.cell_chan.cell_queue) { SMARTLIST_FOREACH_BEGIN(chan->u.cell_chan.cell_queue, cell_queue_entry_t *, q) { - tmp = q; - SMARTLIST_DEL_CURRENT(chan->u.cell_chan.cell_queue, q); tor_free(q); } SMARTLIST_FOREACH_END(q); @@ -807,14 +800,12 @@ channel_force_free(channel_t *chan) if (chan->u.cell_chan.outgoing_queue) { SMARTLIST_FOREACH_BEGIN(chan->u.cell_chan.outgoing_queue, cell_queue_entry_t *, q) { - tmp = q; - SMARTLIST_DEL_CURRENT(chan->u.cell_chan.outgoing_queue, q); - if (tmp->type == CELL_QUEUE_PACKED) { - if (tmp->u.packed.packed_cell) { - packed_cell_free(tmp->u.packed.packed_cell); + if (q->type == CELL_QUEUE_PACKED) { + if (q->u.packed.packed_cell) { + packed_cell_free(q->u.packed.packed_cell); } } - tor_free(tmp); + tor_free(q); } SMARTLIST_FOREACH_END(q); smartlist_free(chan->u.cell_chan.outgoing_queue); @@ -2055,10 +2046,8 @@ channel_process_incoming(channel_t *listener) /* Make sure this is set correctly */ channel_mark_incoming(chan); listener->u.listener.listener(listener, chan); - SMARTLIST_DEL_CURRENT(listener->u.listener.incoming_list, chan); } SMARTLIST_FOREACH_END(chan); - tor_assert(smartlist_len(listener->u.listener.incoming_list) == 0); smartlist_free(listener->u.listener.incoming_list); listener->u.listener.incoming_list = NULL; } @@ -2484,53 +2473,44 @@ channel_run_cleanup(void) void channel_free_all(void) { - channel_t *tmp = NULL; - log_debug(LD_CHANNEL, "Shutting down channels..."); /* First, let's go for finished channels */ if (finished_channels) { SMARTLIST_FOREACH_BEGIN(finished_channels, channel_t *, curr) { - tmp = curr; - /* Remove it from the list */ - SMARTLIST_DEL_CURRENT(finished_channels, curr); /* Deregister and free it */ - tor_assert(tmp); + tor_assert(curr); log_debug(LD_CHANNEL, "Cleaning up finished channel %p (ID " U64_FORMAT ") " "in state %s (%d)", - tmp, U64_PRINTF_ARG(tmp->global_identifier), - channel_state_to_string(tmp->state), tmp->state); - channel_unregister(tmp); - channel_free(tmp); + curr, U64_PRINTF_ARG(curr->global_identifier), + channel_state_to_string(curr->state), curr->state); + channel_unregister(curr); + channel_free(curr); } SMARTLIST_FOREACH_END(curr); smartlist_free(finished_channels); finished_channels = NULL; - tmp = NULL; } /* Now the listeners */ if (listening_channels) { SMARTLIST_FOREACH_BEGIN(listening_channels, channel_t *, curr) { - tmp = curr; - /* Remove it from the list */ - SMARTLIST_DEL_CURRENT(listening_channels, curr); /* Close, deregister and free it */ - tor_assert(tmp); + tor_assert(curr); log_debug(LD_CHANNEL, "Cleaning up listening channel %p (ID " U64_FORMAT ") " "in state %s (%d)", - tmp, U64_PRINTF_ARG(tmp->global_identifier), - channel_state_to_string(tmp->state), tmp->state); + curr, U64_PRINTF_ARG(curr->global_identifier), + channel_state_to_string(curr->state), curr->state); /* * We have to unregister first so we don't put it in finished_channels * and allocate that again on close. */ - channel_unregister(tmp); - channel_request_close(tmp); - channel_force_free(tmp); + channel_unregister(curr); + channel_request_close(curr); + channel_force_free(curr); } SMARTLIST_FOREACH_END(curr); smartlist_free(listening_channels); @@ -2540,23 +2520,20 @@ channel_free_all(void) /* Now all active channels */ if (active_channels) { SMARTLIST_FOREACH_BEGIN(active_channels, channel_t *, curr) { - tmp = curr; - /* Remove it from the list */ - SMARTLIST_DEL_CURRENT(active_channels, curr); /* Close, deregister and free it */ - tor_assert(tmp); + tor_assert(curr); log_debug(LD_CHANNEL, "Cleaning up active channel %p (ID " U64_FORMAT ") " "in state %s (%d)", - tmp, U64_PRINTF_ARG(tmp->global_identifier), - channel_state_to_string(tmp->state), tmp->state); + curr, U64_PRINTF_ARG(curr->global_identifier), + channel_state_to_string(curr->state), curr->state); /* * We have to unregister first so we don't put it in finished_channels * and allocate that again on close. */ - channel_unregister(tmp); - channel_request_close(tmp); - channel_force_free(tmp); + channel_unregister(curr); + channel_request_close(curr); + channel_force_free(curr); } SMARTLIST_FOREACH_END(curr); smartlist_free(active_channels); @@ -2566,23 +2543,20 @@ channel_free_all(void) /* Now all channels, in case any are left over */ if (all_channels) { SMARTLIST_FOREACH_BEGIN(all_channels, channel_t *, curr) { - tmp = curr; - /* Remove it from the list */ - SMARTLIST_DEL_CURRENT(all_channels, curr); /* Close, deregister and free it */ - tor_assert(tmp); + tor_assert(curr); log_debug(LD_CHANNEL, "Cleaning up leftover channel %p (ID " U64_FORMAT ") " "in state %s (%d)", - tmp, U64_PRINTF_ARG(tmp->global_identifier), - channel_state_to_string(tmp->state), tmp->state); - channel_unregister(tmp); - if (!(tmp->state == CHANNEL_STATE_CLOSING || - tmp->state == CHANNEL_STATE_CLOSED || - tmp->state == CHANNEL_STATE_ERROR)) { - channel_request_close(tmp); + curr, U64_PRINTF_ARG(curr->global_identifier), + channel_state_to_string(curr->state), curr->state); + channel_unregister(curr); + if (!(curr->state == CHANNEL_STATE_CLOSING || + curr->state == CHANNEL_STATE_CLOSED || + curr->state == CHANNEL_STATE_ERROR)) { + channel_request_close(curr); } - channel_force_free(tmp); + channel_force_free(curr); } SMARTLIST_FOREACH_END(curr); smartlist_free(all_channels); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 9fd7e6c..883aef1 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -296,7 +296,6 @@ static void channel_tls_close_method(channel_t *chan) { channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); - channel_t *tmp = NULL; tor_assert(tlschan); @@ -317,9 +316,7 @@ channel_tls_close_method(channel_t *chan) if (chan->u.listener.incoming_list) { SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list, channel_t *, ichan) { - tmp = ichan; - SMARTLIST_DEL_CURRENT(chan->u.listener.incoming_list, ichan); - channel_request_close(tmp); + channel_request_close(ichan); } SMARTLIST_FOREACH_END(ichan); smartlist_free(chan->u.listener.incoming_list);

1 0

[tor/master] s/channel_request_close()/channel_mark_for_close()/g for consistency
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit d61e58e1ba594c57afdb4bf49169f59b0a56a7f4 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:14:04 2012 -0700 s/channel_request_close()/channel_mark_for_close()/g for consistency --- src/or/channel.c | 12 ++++++------ src/or/channel.h | 2 +- src/or/channeltls.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 469dc5d..5b40028 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -772,7 +772,7 @@ channel_force_free(channel_t *chan) if (chan->u.listener.incoming_list) { SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list, channel_t *, qchan) { - channel_request_close(qchan); + channel_mark_for_close(qchan); } SMARTLIST_FOREACH_END(qchan); smartlist_free(chan->u.listener.incoming_list); @@ -965,7 +965,7 @@ channel_set_cell_handlers(channel_t *chan, } /** - * Request a channel be closed + * Mark a channel to be closed * * This function tries to close a channel_t; it will go into the CLOSING * state, and eventually the lower layer should put it into the CLOSED or @@ -975,7 +975,7 @@ channel_set_cell_handlers(channel_t *chan, */ void -channel_request_close(channel_t *chan) +channel_mark_for_close(channel_t *chan) { tor_assert(chan != NULL); tor_assert(chan->close != NULL); @@ -2419,7 +2419,7 @@ channel_free_all(void) * and allocate that again on close. */ channel_unregister(curr); - channel_request_close(curr); + channel_mark_for_close(curr); channel_force_free(curr); } SMARTLIST_FOREACH_END(curr); @@ -2442,7 +2442,7 @@ channel_free_all(void) * and allocate that again on close. */ channel_unregister(curr); - channel_request_close(curr); + channel_mark_for_close(curr); channel_force_free(curr); } SMARTLIST_FOREACH_END(curr); @@ -2464,7 +2464,7 @@ channel_free_all(void) if (!(curr->state == CHANNEL_STATE_CLOSING || curr->state == CHANNEL_STATE_CLOSED || curr->state == CHANNEL_STATE_ERROR)) { - channel_request_close(curr); + channel_mark_for_close(curr); } channel_force_free(curr); } SMARTLIST_FOREACH_END(curr); diff --git a/src/or/channel.h b/src/or/channel.h index fac2b3b..182639e 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -230,7 +230,7 @@ const char * channel_state_to_string(channel_state_t state); /* Abstract channel operations */ -void channel_request_close(channel_t *chan); +void channel_mark_for_close(channel_t *chan); void channel_write_cell(channel_t *chan, cell_t *cell); void channel_write_packed_cell(channel_t *chan, packed_cell_t *cell); void channel_write_var_cell(channel_t *chan, var_cell_t *cell); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 883aef1..bb6ef9b 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -224,7 +224,7 @@ channel_tls_free_all(void) if (channel_tls_listener) { base = TLS_CHAN_TO_BASE(channel_tls_listener); channel_unregister(base); - channel_request_close(base); + channel_mark_for_close(base); channel_free(base); channel_tls_listener = NULL; } @@ -316,7 +316,7 @@ channel_tls_close_method(channel_t *chan) if (chan->u.listener.incoming_list) { SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list, channel_t *, ichan) { - channel_request_close(ichan); + channel_mark_for_close(ichan); } SMARTLIST_FOREACH_END(ichan); smartlist_free(chan->u.listener.incoming_list);

1 0

[tor/master] Simplify channel_next_with_digest() in channel.c
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 123a08e4a33f6750c3857c5c7ed3515bb196db53 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:08:18 2012 -0700 Simplify channel_next_with_digest() in channel.c --- src/or/channel.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index f987cae..2ca9a13 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -622,15 +622,10 @@ channel_find_by_remote_digest(const char *identity_digest) channel_t * channel_next_with_digest(channel_t *chan) { - channel_t *rv = NULL; - tor_assert(chan); tor_assert(!(chan->is_listener)); - if (chan->u.cell_chan.next_with_same_id) - rv = chan->u.cell_chan.next_with_same_id; - - return rv; + return chan->u.cell_chan.next_with_same_id; } /**

1 0

[tor/master] Fix typo in comment
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 4686638743919513baa72001d4676996f5e53c14 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:15:09 2012 -0700 Fix typo in comment --- src/or/channel.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/channel.h b/src/or/channel.h index 182639e..8fb29d8 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -12,7 +12,7 @@ #include "or.h" /* - * Channel struct; see thw channel_t typedef in or.h. A channel is an + * Channel struct; see the channel_t typedef in or.h. A channel is an * abstract interface for the OR-to-OR connection, similar to connection_or_t, * but without the strong coupling to the underlying TLS implementation. They * are constructed by calling a protocol-specific function to open a channel

1 0

[tor/master] s/cell_queue/incoming_queue/g in channel.c for consistency with outgoing_queue
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit ee4e88e4d9891a24334870616067d21580f95704 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:20:28 2012 -0700 s/cell_queue/incoming_queue/g in channel.c for consistency with outgoing_queue --- src/or/channel.c | 66 +++++++++++++++++++++++++++--------------------------- src/or/channel.h | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 5b40028..cdb0830 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -783,14 +783,14 @@ channel_force_free(channel_t *chan) smartlist_free(chan->u.cell_chan.active_circuit_pqueue); /* We might still have a cell queue; kill it */ - if (chan->u.cell_chan.cell_queue) { - SMARTLIST_FOREACH_BEGIN(chan->u.cell_chan.cell_queue, + if (chan->u.cell_chan.incoming_queue) { + SMARTLIST_FOREACH_BEGIN(chan->u.cell_chan.incoming_queue, cell_queue_entry_t *, q) { tor_free(q); } SMARTLIST_FOREACH_END(q); - smartlist_free(chan->u.cell_chan.cell_queue); - chan->u.cell_chan.cell_queue = NULL; + smartlist_free(chan->u.cell_chan.incoming_queue); + chan->u.cell_chan.incoming_queue = NULL; } /* Outgoing cell queue is similar, but we can have to free packed cells */ @@ -957,8 +957,8 @@ channel_set_cell_handlers(channel_t *chan, chan->u.cell_chan.var_cell_handler = var_cell_handler; /* Re-run the queue if we have one and there's any reason to */ - if (chan->u.cell_chan.cell_queue && - (smartlist_len(chan->u.cell_chan.cell_queue) > 0) && + if (chan->u.cell_chan.incoming_queue && + (smartlist_len(chan->u.cell_chan.incoming_queue) > 0) && try_again && (chan->u.cell_chan.cell_handler || chan->u.cell_chan.var_cell_handler)) channel_process_cells(chan); @@ -1633,8 +1633,8 @@ channel_change_state(channel_t *chan, channel_state_t to_state) if (!(chan->is_listener) && to_state == CHANNEL_STATE_OPEN) { /* Check for queued cells to process */ - if (chan->u.cell_chan.cell_queue && - smartlist_len(chan->u.cell_chan.cell_queue) > 0) + if (chan->u.cell_chan.incoming_queue && + smartlist_len(chan->u.cell_chan.incoming_queue) > 0) channel_process_cells(chan); if (chan->u.cell_chan.outgoing_queue && smartlist_len(chan->u.cell_chan.outgoing_queue) > 0) @@ -1646,8 +1646,8 @@ channel_change_state(channel_t *chan, channel_state_t to_state) tor_assert(!(chan->u.listener.incoming_list) || smartlist_len(chan->u.listener.incoming_list) == 0); } else { - tor_assert(!(chan->u.cell_chan.cell_queue) || - smartlist_len(chan->u.cell_chan.cell_queue) == 0); + tor_assert(!(chan->u.cell_chan.incoming_queue) || + smartlist_len(chan->u.cell_chan.incoming_queue) == 0); tor_assert(!(chan->u.cell_chan.outgoing_queue) || smartlist_len(chan->u.cell_chan.outgoing_queue) == 0); } @@ -1881,8 +1881,8 @@ channel_more_to_flush(channel_t *chan) tor_assert(!(chan->is_listener)); /* Check if we have any queued */ - if (chan->u.cell_chan.cell_queue && - smartlist_len(chan->u.cell_chan.cell_queue) > 0) return 1; + if (chan->u.cell_chan.incoming_queue && + smartlist_len(chan->u.cell_chan.incoming_queue) > 0) return 1; /* Check if any circuits would like to queue some */ if (chan->u.cell_chan.active_circuits) return 1; @@ -2108,13 +2108,13 @@ channel_process_cells(channel_t *chan) if (!(chan->u.cell_chan.cell_handler || chan->u.cell_chan.var_cell_handler)) return; /* Nothing we can do if we have no cells */ - if (!(chan->u.cell_chan.cell_queue)) return; + if (!(chan->u.cell_chan.incoming_queue)) return; /* * Process cells until we're done or find one we have no current handler * for. */ - SMARTLIST_FOREACH_BEGIN(chan->u.cell_chan.cell_queue, + SMARTLIST_FOREACH_BEGIN(chan->u.cell_chan.incoming_queue, cell_queue_entry_t *, q) { tor_assert(q); tor_assert(q->type == CELL_QUEUE_FIXED || @@ -2128,7 +2128,7 @@ channel_process_cells(channel_t *chan) "Processing incoming cell_t %p for channel %p", q->u.fixed.cell, chan); chan->u.cell_chan.cell_handler(chan, q->u.fixed.cell); - SMARTLIST_DEL_CURRENT(chan->u.cell_chan.cell_queue, q); + SMARTLIST_DEL_CURRENT(chan->u.cell_chan.incoming_queue, q); tor_free(q); } else if (q->type == CELL_QUEUE_VAR && chan->u.cell_chan.var_cell_handler) { @@ -2138,7 +2138,7 @@ channel_process_cells(channel_t *chan) "Processing incoming var_cell_t %p for channel %p", q->u.var.var_cell, chan); chan->u.cell_chan.var_cell_handler(chan, q->u.var.var_cell); - SMARTLIST_DEL_CURRENT(chan->u.cell_chan.cell_queue, q); + SMARTLIST_DEL_CURRENT(chan->u.cell_chan.incoming_queue, q); tor_free(q); } else { /* Can't handle this one */ @@ -2147,9 +2147,9 @@ channel_process_cells(channel_t *chan) } SMARTLIST_FOREACH_END(q); /* If the list is empty, free it */ - if (smartlist_len(chan->u.cell_chan.cell_queue) == 0 ) { - smartlist_free(chan->u.cell_chan.cell_queue); - chan->u.cell_chan.cell_queue = NULL; + if (smartlist_len(chan->u.cell_chan.incoming_queue) == 0 ) { + smartlist_free(chan->u.cell_chan.incoming_queue); + chan->u.cell_chan.incoming_queue = NULL; } } @@ -2176,13 +2176,13 @@ channel_queue_cell(channel_t *chan, cell_t *cell) /* Do we need to queue it, or can we just call the handler right away? */ if (!(chan->u.cell_chan.cell_handler)) need_to_queue = 1; - if (chan->u.cell_chan.cell_queue && - (smartlist_len(chan->u.cell_chan.cell_queue) > 0)) + if (chan->u.cell_chan.incoming_queue && + (smartlist_len(chan->u.cell_chan.incoming_queue) > 0)) need_to_queue = 1; /* If we need to queue and have no queue, create one */ - if (need_to_queue && !(chan->u.cell_chan.cell_queue)) { - chan->u.cell_chan.cell_queue = smartlist_new(); + if (need_to_queue && !(chan->u.cell_chan.incoming_queue)) { + chan->u.cell_chan.incoming_queue = smartlist_new(); } /* Timestamp for receiving */ @@ -2200,14 +2200,14 @@ channel_queue_cell(channel_t *chan, cell_t *cell) chan->u.cell_chan.cell_handler(chan, cell); } else { /* Otherwise queue it and then process the queue if possible. */ - tor_assert(chan->u.cell_chan.cell_queue); + tor_assert(chan->u.cell_chan.incoming_queue); q = tor_malloc(sizeof(*q)); q->type = CELL_QUEUE_FIXED; q->u.fixed.cell = cell; log_debug(LD_CHANNEL, "Queueing incoming cell_t %p for channel %p", cell, chan); - smartlist_add(chan->u.cell_chan.cell_queue, q); + smartlist_add(chan->u.cell_chan.incoming_queue, q); if (chan->u.cell_chan.cell_handler || chan->u.cell_chan.var_cell_handler) { channel_process_cells(chan); @@ -2238,13 +2238,13 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell) /* Do we need to queue it, or can we just call the handler right away? */ if (!(chan->u.cell_chan.var_cell_handler)) need_to_queue = 1; - if (chan->u.cell_chan.cell_queue && - (smartlist_len(chan->u.cell_chan.cell_queue) > 0)) + if (chan->u.cell_chan.incoming_queue && + (smartlist_len(chan->u.cell_chan.incoming_queue) > 0)) need_to_queue = 1; /* If we need to queue and have no queue, create one */ - if (need_to_queue && !(chan->u.cell_chan.cell_queue)) { - chan->u.cell_chan.cell_queue = smartlist_new(); + if (need_to_queue && !(chan->u.cell_chan.incoming_queue)) { + chan->u.cell_chan.incoming_queue = smartlist_new(); } /* Timestamp for receiving */ @@ -2262,14 +2262,14 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell) chan->u.cell_chan.var_cell_handler(chan, var_cell); } else { /* Otherwise queue it and then process the queue if possible. */ - tor_assert(chan->u.cell_chan.cell_queue); + tor_assert(chan->u.cell_chan.incoming_queue); q = tor_malloc(sizeof(*q)); q->type = CELL_QUEUE_VAR; q->u.var.var_cell = var_cell; log_debug(LD_CHANNEL, "Queueing incoming var_cell_t %p for channel %p", var_cell, chan); - smartlist_add(chan->u.cell_chan.cell_queue, q); + smartlist_add(chan->u.cell_chan.incoming_queue, q); if (chan->u.cell_chan.cell_handler || chan->u.cell_chan.var_cell_handler) { channel_process_cells(chan); @@ -2864,8 +2864,8 @@ channel_dump_statistics(channel_t *chan, int severity) " * Cell-bearing channel " U64_FORMAT " has %d queued incoming cells" " and %d queued outgoing cells", U64_PRINTF_ARG(chan->global_identifier), - (chan->u.cell_chan.cell_queue != NULL) ? - smartlist_len(chan->u.cell_chan.cell_queue) : 0, + (chan->u.cell_chan.incoming_queue != NULL) ? + smartlist_len(chan->u.cell_chan.incoming_queue) : 0, (chan->u.cell_chan.outgoing_queue != NULL) ? smartlist_len(chan->u.cell_chan.outgoing_queue) : 0); diff --git a/src/or/channel.h b/src/or/channel.h index 8fb29d8..696ae07 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -132,7 +132,7 @@ struct channel_s { channel_t *next_with_same_id, *prev_with_same_id; /* List of incoming cells to handle */ - smartlist_t *cell_queue; + smartlist_t *incoming_queue; /* List of queued outgoing cells */ smartlist_t *outgoing_queue;

1 0

[tor/master] Use typedefs for function pointer return values and s/listener/listener_fn/ for distinctness
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 89a00ee63ae61e707343432dd9f74702cf60ac3c Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 20:49:19 2012 -0700 Use typedefs for function pointer return values and s/listener/listener_fn/ for distinctness --- src/or/channel.c | 25 +++++++++++-------------- src/or/channel.h | 32 +++++++++++++++++++------------- src/or/command.c | 2 +- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index cdb0830..9fbfecb 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -823,9 +823,8 @@ channel_force_free(channel_t *chan) * @return Function pointer to an incoming channel handler */ -void -(* channel_get_listener(channel_t *chan)) - (channel_t *, channel_t *) +channel_listener_fn_ptr +channel_get_listener_fn(channel_t *chan) { tor_assert(chan); tor_assert(chan->is_listener); @@ -847,8 +846,8 @@ void */ void -channel_set_listener(channel_t *chan, - void (*listener)(channel_t *, channel_t *) ) +channel_set_listener_fn(channel_t *chan, + channel_listener_fn_ptr listener) { tor_assert(chan); tor_assert(chan->is_listener); @@ -872,9 +871,8 @@ channel_set_listener(channel_t *chan, * @return A function pointer to chan's fixed-length cell handler, if any. */ -void -(* channel_get_cell_handler(channel_t *chan)) - (channel_t *, cell_t *) +channel_cell_handler_fn_ptr +channel_get_cell_handler(channel_t *chan) { tor_assert(chan); tor_assert(!(chan->is_listener)); @@ -897,9 +895,8 @@ void * @return A function pointer to chan's variable-length cell handler, if any. */ -void -(* channel_get_var_cell_handler(channel_t *chan)) - (channel_t *, var_cell_t *) +channel_var_cell_handler_fn_ptr +channel_get_var_cell_handler(channel_t *chan) { tor_assert(chan); tor_assert(!(chan->is_listener)); @@ -927,9 +924,9 @@ void void channel_set_cell_handlers(channel_t *chan, - void (*cell_handler)(channel_t *, cell_t *), - void (*var_cell_handler)(channel_t *, - var_cell_t *)) + channel_cell_handler_fn_ptr cell_handler, + channel_var_cell_handler_fn_ptr + var_cell_handler) { int try_again = 0; diff --git a/src/or/channel.h b/src/or/channel.h index 696ae07..70ea30f 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -11,6 +11,11 @@ #include "or.h" +/* Channel handler function pointer typedefs */ +typedef void (*channel_listener_fn_ptr)(channel_t *, channel_t *); +typedef void (*channel_cell_handler_fn_ptr)(channel_t *, cell_t *); +typedef void (*channel_var_cell_handler_fn_ptr)(channel_t *, var_cell_t *); + /* * Channel struct; see the channel_t typedef in or.h. A channel is an * abstract interface for the OR-to-OR connection, similar to connection_or_t, @@ -65,7 +70,7 @@ struct channel_s { union { struct { /* Registered listen handler to call on incoming connection */ - void (*listener)(channel_t *, channel_t *); + channel_listener_fn_ptr listener; /* List of pending incoming connections */ smartlist_t *incoming_list; @@ -78,8 +83,8 @@ struct channel_s { } listener; struct { /* Registered handlers for incoming cells */ - void (*cell_handler)(channel_t *, cell_t *); - void (*var_cell_handler)(channel_t *, var_cell_t *); + channel_cell_handler_fn_ptr cell_handler; + channel_var_cell_handler_fn_ptr var_cell_handler; /* Methods implemented by the lower layer */ @@ -238,19 +243,20 @@ void channel_write_var_cell(channel_t *chan, var_cell_t *cell); /* Channel callback registrations */ /* Listener callback */ -void (* channel_get_listener(channel_t *chan))(channel_t *, channel_t *); -void channel_set_listener(channel_t *chan, - void (*listener)(channel_t *, channel_t *) ); +channel_listener_fn_ptr channel_get_listener_fn(channel_t *chan); +void channel_set_listener_fn(channel_t *chan, + channel_listener_fn_ptr listener); /* Incoming cell callbacks */ -void (* channel_get_cell_handler(channel_t *chan)) - (channel_t *, cell_t *); -void (* channel_get_var_cell_handler(channel_t *chan)) - (channel_t *, var_cell_t *); +channel_cell_handler_fn_ptr channel_get_cell_handler(channel_t *chan); + +channel_var_cell_handler_fn_ptr +channel_get_var_cell_handler(channel_t *chan); + void channel_set_cell_handlers(channel_t *chan, - void (*cell_handler)(channel_t *, cell_t *), - void (*var_cell_handler)(channel_t *, - var_cell_t *)); + channel_cell_handler_fn_ptr cell_handler, + channel_var_cell_handler_fn_ptr + var_cell_handler); /* Clean up closed channels periodically; called from run_scheduled_events() * in main.c diff --git a/src/or/command.c b/src/or/command.c index 351ab08..2fb70b5 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -505,6 +505,6 @@ command_setup_listener(channel_t *listener) tor_assert(listener); tor_assert(listener->state == CHANNEL_STATE_LISTENING); - channel_set_listener(listener, command_handle_incoming_channel); + channel_set_listener_fn(listener, command_handle_incoming_channel); }

1 0

[tor/master] Set reason_for_closing when erroring out of channel_tls_connect()
by andrea＠torproject.org 11 Oct '12

11 Oct '12

commit 53454fad956c278921487a9956aa9f022b9cc2c7 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Oct 9 10:51:10 2012 -0700 Set reason_for_closing when erroring out of channel_tls_connect() --- src/or/channeltls.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 93e0636..339663e 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -133,6 +133,7 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, tlschan->conn = connection_or_connect(addr, port, id_digest, tlschan); /* connection_or_connect() will fill in tlschan->conn */ if (!(tlschan->conn)) { + chan->reason_for_closing = CHANNEL_CLOSE_FOR_ERROR; channel_change_state(chan, CHANNEL_STATE_ERROR); goto err; }

1 0