tor-commits October 2012

tor-commits@lists.torproject.org

20 participants
1288 discussions

[tor/master] Add changes file for bug6816
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit cf994f7ad758af01d7cb9318bcf5be7e36c5c71b Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Oct 10 00:51:55 2012 -0700 Add changes file for bug6816 --- changes/bug6816 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug6816 b/changes/bug6816 new file mode 100644 index 0000000..e9e6877 --- /dev/null +++ b/changes/bug6816 @@ -0,0 +1,6 @@ + o Infrastructure features: + - Introduce new circuitmux_t storing the queue of circuits for a channel; + this encapsulates and abstracts the queue logic and circuit selection + policy, and allows the latter to be overridden easily by switching out + a policy object. The existing EWMA behavior is now implemented as a + circuitmux_policy_t. This fixes bug 6816.

1 0

[tor/master] Remove variables; fix gcc 4.7 warnings
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit bd28322d3815a03ca04beb6d00052d613dbe226f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 21:25:52 2012 -0400 Remove variables; fix gcc 4.7 warnings My GCC warns when variables are assigned to but never used. There were a few like that in the 6816/6465 branches. --- src/or/channel.c | 3 +-- src/or/channeltls.c | 3 --- src/or/circuitlist.c | 4 +--- src/or/circuitmux_ewma.c | 5 ----- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 570bb37..b52db40 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -552,7 +552,7 @@ channel_add_to_digest_map(channel_t *chan) static void channel_remove_from_digest_map(channel_t *chan) { - channel_t *tmp, *head; + channel_t *tmp; tor_assert(chan); @@ -588,7 +588,6 @@ channel_remove_from_digest_map(channel_t *chan) tmp = digestmap_get(channel_identity_map, chan->identity_digest); if (tmp) { /* Okay, it's here */ - head = tmp; /* Keep track of list head */ /* Look for this channel */ while (tmp && tmp != chan) { tmp = tmp->next_with_same_id; diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 764de80..1a2956b 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -917,7 +917,6 @@ void channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) { channel_tls_t *chan; - int handshaking; #ifdef KEEP_TIMING_STATS /* how many of each cell have we seen so far this second? needs better @@ -953,8 +952,6 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) return; } - handshaking = (TO_CONN(conn)->state != OR_CONN_STATE_OPEN); - if (TO_CONN(conn)->marked_for_close) return; diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 5140600..b738226 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -100,18 +100,16 @@ circuit_set_circid_chan_helper(circuit_t *circ, int direction, chan_circid_circuit_map_t *found; channel_t *old_chan, **chan_ptr; circid_t old_id, *circid_ptr; - int was_active, make_active, attached = 0; + int make_active, attached = 0; if (direction == CELL_DIRECTION_OUT) { chan_ptr = &circ->n_chan; circid_ptr = &circ->n_circ_id; - was_active = circ->next_active_on_n_chan != NULL; make_active = circ->n_chan_cells.n > 0; } else { or_circuit_t *c = TO_OR_CIRCUIT(circ); chan_ptr = &c->p_chan; circid_ptr = &c->p_circ_id; - was_active = c->next_active_on_p_chan != NULL; make_active = c->p_chan_cells.n > 0; } old_chan = *chan_ptr; diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index 82ad5c7..c280bf4 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -265,7 +265,6 @@ ewma_alloc_circ_data(circuitmux_t *cmux, cell_direction_t direction, unsigned int cell_count) { - ewma_policy_data_t *pol = NULL; ewma_policy_circ_data_t *cdata = NULL; tor_assert(cmux); @@ -276,8 +275,6 @@ ewma_alloc_circ_data(circuitmux_t *cmux, /* Shut the compiler up */ tor_assert(cell_count == cell_count); - pol = TO_EWMA_POL_DATA(pol_data); - cdata = tor_malloc_zero(sizeof(*cdata)); cdata->_base.magic = EWMA_POL_CIRC_DATA_MAGIC; cdata->circ = circ; @@ -309,13 +306,11 @@ ewma_free_circ_data(circuitmux_t *cmux, circuitmux_policy_circ_data_t *pol_circ_data) { - ewma_policy_data_t *pol = NULL; ewma_policy_circ_data_t *cdata = NULL; tor_assert(cmux); tor_assert(circ); tor_assert(pol_data); - pol = TO_EWMA_POL_DATA(pol_data); if (!pol_circ_data) return;

1 0

[tor/master] Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
by andrea＠torproject.org 10 Oct '12

10 Oct '12

1 0

[tor/master] Keep better statistics about channels and dump them from dumpstats() on SIGUSR1
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit 7138a4adac9592edbb73d3983cc51db153c76edf Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Thu Sep 13 02:44:21 2012 -0700 Keep better statistics about channels and dump them from dumpstats() on SIGUSR1 --- src/or/channel.c | 400 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/channel.h | 33 ++++- src/or/channeltls.c | 43 ++++++ src/or/main.c | 4 +- 4 files changed, 472 insertions(+), 8 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 0268fce..cf08e3b 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1488,6 +1488,8 @@ channel_write_cell(channel_t *chan, cell_t *cell) channel_timestamp_xmit(chan); /* If we're here the queue is empty, so it's drained too */ channel_timestamp_drained(chan); + /* Update the counter */ + ++(chan->u.cell_chan.n_cells_xmitted); } } @@ -1546,6 +1548,8 @@ channel_write_packed_cell(channel_t *chan, packed_cell_t *packed_cell) channel_timestamp_xmit(chan); /* If we're here the queue is empty, so it's drained too */ channel_timestamp_drained(chan); + /* Update the counter */ + ++(chan->u.cell_chan.n_cells_xmitted); } } @@ -1609,6 +1613,8 @@ channel_write_var_cell(channel_t *chan, var_cell_t *var_cell) channel_timestamp_xmit(chan); /* If we're here the queue is empty, so it's drained too */ channel_timestamp_drained(chan); + /* Update the counter */ + ++(chan->u.cell_chan.n_cells_xmitted); } } @@ -1883,6 +1889,7 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, tor_free(q); ++flushed; channel_timestamp_xmit(chan); + ++(chan->u.cell_chan.n_cells_xmitted); } /* Else couldn't write it; leave it on the queue */ } else { @@ -1902,6 +1909,7 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, tor_free(q); ++flushed; channel_timestamp_xmit(chan); + ++(chan->u.cell_chan.n_cells_xmitted); } /* Else couldn't write it; leave it on the queue */ } else { @@ -1921,6 +1929,7 @@ channel_flush_some_cells_from_outgoing_queue(channel_t *chan, tor_free(q); ++flushed; channel_timestamp_xmit(chan); + ++(chan->u.cell_chan.n_cells_xmitted); } /* Else couldn't write it; leave it on the queue */ } else { @@ -2179,6 +2188,11 @@ channel_queue_incoming(channel_t *listener, channel_t *incoming) listener->u.listener.incoming_list = smartlist_new(); } + /* Bump the counter and timestamp it */ + channel_timestamp_active(listener); + channel_timestamp_accepted(listener); + ++(listener->u.listener.n_accepted); + /* If we don't need to queue, process it right away */ if (!need_to_queue) { tor_assert(listener->u.listener.listener); @@ -2301,6 +2315,9 @@ channel_queue_cell(channel_t *chan, cell_t *cell) /* Timestamp for receiving */ channel_timestamp_recv(chan); + /* Update the counter */ + ++(chan->u.cell_chan.n_cells_recved); + /* If we don't need to queue we can just call cell_handler */ if (!need_to_queue) { tor_assert(chan->u.cell_chan.cell_handler); @@ -2360,6 +2377,9 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell) /* Timestamp for receiving */ channel_timestamp_recv(chan); + /* Update the counter */ + ++(chan->u.cell_chan.n_cells_recved); + /* If we don't need to queue we can just call cell_handler */ if (!need_to_queue) { tor_assert(chan->u.cell_chan.var_cell_handler); @@ -2417,6 +2437,41 @@ channel_send_destroy(circid_t circ_id, channel_t *chan, int reason) } /** + * Channel statistics + * + * This is called from dumpstats() in main.c and spams the log with + * statistics on channels. + */ + +void +channel_dumpstats(int severity) +{ + if (all_channels && smartlist_len(all_channels) > 0) { + log(severity, LD_GENERAL, + "Dumping statistics about %d channels:", + smartlist_len(all_channels)); + log(severity, LD_GENERAL, + "%d are active, %d are listeners, and %d are done and " + "waiting for cleanup", + (active_channels != NULL) ? + smartlist_len(active_channels) : 0, + (listening_channels != NULL) ? + smartlist_len(listening_channels) : 0, + (finished_channels != NULL) ? + smartlist_len(finished_channels) : 0); + + SMARTLIST_FOREACH(all_channels, channel_t *, chan, + channel_dump_statistics(chan, severity)); + + log(severity, LD_GENERAL, + "Done spamming about channels now"); + } else { + log(severity, LD_GENERAL, + "No channels to dump"); + } +} + +/** * Channel cleanup * * This gets called periodically from run_scheduled_events() in main.c; @@ -2785,6 +2840,265 @@ channel_get_for_extend(const char *digest, } /** + * Describe the transport subclass + * + * Invoke a method to get a string description of the lower-layer + * transport for this channel. + */ + +const char * +channel_describe_transport(channel_t *chan) +{ + tor_assert(chan); + tor_assert(chan->describe_transport); + + return chan->describe_transport(chan); +} + +/** + * Dump channel statistics + * + * Dump statistics for one channel to the log + */ + +void +channel_dump_statistics(channel_t *chan, int severity) +{ + double avg, interval, age; + time_t now = time(NULL); + tor_addr_t remote_addr; + int have_remote_addr; + char *remote_addr_str; + + tor_assert(chan); + + age = (double)(now - chan->timestamp_created); + + log(severity, LD_GENERAL, + "Channel %lu (at %p) with transport %s is in state %s (%d) and %s", + chan->global_identifier, chan, + channel_describe_transport(chan), + channel_state_to_string(chan->state), chan->state, + chan->is_listener ? + "listens for incoming connections" : + "transports cells"); + log(severity, LD_GENERAL, + " * Channel %lu was created at %lu (%lu seconds ago) and last active " + "at %lu (%lu seconds ago)", + chan->global_identifier, + chan->timestamp_created, now - chan->timestamp_created, + chan->timestamp_active, now - chan->timestamp_active); + if (chan->is_listener) { + log(severity, LD_GENERAL, + " * Listener channel %lu last accepted an incoming channel at %lu " + "(%lu seconds ago) and has accepted %lu channels in total", + chan->global_identifier, + chan->u.listener.timestamp_accepted, + now - chan->u.listener.timestamp_accepted, + chan->u.listener.n_accepted); + + /* + * If it's sensible to do so, get the rate of incoming channels on this + * listener + */ + if (now > chan->timestamp_created && + chan->timestamp_created > 0 && + chan->u.listener.n_accepted > 0) { + avg = (double)(chan->u.listener.n_accepted) / age; + if (avg >= 1.0) { + log(severity, LD_GENERAL, + " * Listener channel %lu has averaged %f incoming channels per " + "second", + chan->global_identifier, avg); + } else if (avg >= 0.0) { + interval = 1.0 / avg; + log(severity, LD_GENERAL, + " * Listener channel %lu has averaged %f seconds between " + "incoming channels", + chan->global_identifier, interval); + } + } + } else { + /* Handle digest and nickname */ + if (!tor_digest_is_zero(chan->u.cell_chan.identity_digest)) { + if (chan->u.cell_chan.nickname) { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu says it is connected to an OR " + "with digest %s and nickname %s", + chan->global_identifier, + hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN), + chan->u.cell_chan.nickname); + } else { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu says it is connected to an OR " + "with digest %s and no known nickname", + chan->global_identifier, + hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); + } + } else { + if (chan->u.cell_chan.nickname) { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu does not know the digest of the " + "OR it is connected to, but reports its nickname is %s", + chan->global_identifier, + chan->u.cell_chan.nickname); + } else { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu does not know the digest or the " + "nickname of the OR it is connected to", + chan->global_identifier); + } + } + + /* Handle remote address and descriptions */ + have_remote_addr = channel_get_addr_if_possible(chan, &remote_addr); + if (have_remote_addr) { + remote_addr_str = tor_dup_addr(&remote_addr); + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu says its remote address is %s, " + "and gives a canonical description of \"%s\" and an " + "actual description of \"%s\"", + chan->global_identifier, + remote_addr_str, + channel_get_canonical_remote_descr(chan), + channel_get_actual_remote_descr(chan)); + tor_free(remote_addr_str); + } else { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu does not know its remote address, " + "but gives a canonical description of \"%s\" and an " + "actual description of \"%s\"", + chan->global_identifier, + channel_get_canonical_remote_descr(chan), + channel_get_actual_remote_descr(chan)); + } + + /* Handle marks */ + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has these marks: %s %s %s " + "%s %s %s", + chan->global_identifier, + channel_is_bad_for_new_circs(chan) ? + "bad_for_new_circs" : "!bad_for_new_circs", + channel_is_canonical(chan) ? + "canonical" : "!canonical", + channel_is_canonical_is_reliable(chan) ? + "is_canonical_is_reliable" : + "!is_canonical_is_reliable", + channel_is_client(chan) ? + "client" : "!client", + channel_is_local(chan) ? + "local" : "!local", + channel_is_incoming(chan) ? + "incoming" : "outgoing"); + + /* Describe queues */ + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has %d queued incoming cells " + "and %d queued outgoing cells", + chan->global_identifier, + (chan->u.cell_chan.cell_queue != NULL) ? + smartlist_len(chan->u.cell_chan.cell_queue) : 0, + (chan->u.cell_chan.outgoing_queue != NULL) ? + smartlist_len(chan->u.cell_chan.outgoing_queue) : 0); + + /* Describe circuits */ + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has %d active circuits out of %d" + " in total", + chan->global_identifier, + (chan->u.cell_chan.active_circuit_pqueue != NULL) ? + smartlist_len(chan->u.cell_chan.active_circuit_pqueue) : 0, + chan->u.cell_chan.n_circuits); + /* TODO better circuit info once circuit structure refactor is finished */ + + /* Describe timestamps */ + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu was last used by a client at %lu " + "(%lu seconds ago)", + chan->global_identifier, + chan->u.cell_chan.timestamp_client, + now - chan->u.cell_chan.timestamp_client); + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu was last drained at %lu " + "(%lu seconds ago)", + chan->global_identifier, + chan->u.cell_chan.timestamp_drained, + now - chan->u.cell_chan.timestamp_drained); + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu last received a cell at %lu " + "(%lu seconds ago)", + chan->global_identifier, + chan->u.cell_chan.timestamp_recv, + now - chan->u.cell_chan.timestamp_recv); + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu last trasmitted a cell at %lu " + "(%lu seconds ago)", + chan->global_identifier, + chan->u.cell_chan.timestamp_xmit, + now - chan->u.cell_chan.timestamp_xmit); + + /* Describe counters and rates */ + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has received %lu cells and " + " transmitted %lu", + chan->global_identifier, + chan->u.cell_chan.n_cells_recved, + chan->u.cell_chan.n_cells_xmitted); + if (now > chan->timestamp_created && + chan->timestamp_created > 0) { + if (chan->u.cell_chan.n_cells_recved > 0) { + avg = (double)(chan->u.cell_chan.n_cells_recved) / age; + if (avg >= 1.0) { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has averaged %f cells received " + "per second", + chan->global_identifier, avg); + } else if (avg >= 0.0) { + interval = 1.0 / avg; + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has averaged %f seconds between " + "received cells", + chan->global_identifier, interval); + } + } + if (chan->u.cell_chan.n_cells_xmitted > 0) { + avg = (double)(chan->u.cell_chan.n_cells_xmitted) / age; + if (avg >= 1.0) { + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has averaged %f cells transmitted " + "per second", + chan->global_identifier, avg); + } else if (avg >= 0.0) { + interval = 1.0 / avg; + log(severity, LD_GENERAL, + " * Cell-bearing channel %lu has averaged %f seconds between " + "transmitted cells", + chan->global_identifier, interval); + } + } + } + } + + /* Dump anything the lower layer has to say */ + channel_dump_transport_statistics(chan, severity); +} + +/** + * Invoke transport-specific stats dump + * + * If there is a lower-layer statistics dump method, invoke it + */ + +void +channel_dump_transport_statistics(channel_t *chan, int severity) +{ + tor_assert(chan); + + if (chan->dumpstats) chan->dumpstats(chan, severity); +} + +/** * Return text description of the remote endpoint * * This function return a test provided by the lower layer of the remote @@ -3138,7 +3452,7 @@ channel_timestamp_created(channel_t *chan) /** * Update the last active timestamp. * - * This function updates the channe's last active timestamp; it should be + * This function updates the channel's last active timestamp; it should be * called by the lower layer whenever there is activity on the channel which * does not lead to a cell being transmitted or received; the active timestamp * is also updated from channel_timestamp_recv() and channel_timestamp_xmit(), @@ -3159,6 +3473,26 @@ channel_timestamp_active(channel_t *chan) } /** + * Update the last accepted timestamp. + * + * This function updates the channel's last accepted timestamp; it should be + * called whenever a new incoming channel is accepted on a listener. + * + * @param chan Channel to update + */ + +void +channel_timestamp_accepted(channel_t *chan) +{ + time_t now = time(NULL); + + tor_assert(chan); + tor_assert(chan->is_listener); + + chan->u.listener.timestamp_accepted = now; +} + +/** * Update client timestamp * * This function is called by relay.c to timestamp a channel that appears to @@ -3276,6 +3610,22 @@ channel_when_last_active(channel_t *chan) } /** + * Query last accepted timestamp + * + * @param chan Channel to query + * @return Last accepted timestamp value for chan + */ + +time_t +channel_when_last_accepted(channel_t *chan) +{ + tor_assert(chan); + tor_assert(chan->is_listener); + + return chan->u.listener.timestamp_accepted; +} + +/** * Query client timestamp * * @param chan Channel to query @@ -3340,6 +3690,54 @@ channel_when_last_xmit(channel_t *chan) } /** + * Query accepted counter + * + * @param chan Channel to query + * @return Number of incoming channels accepted by this listener + */ + +uint64_t +channel_count_accepted(channel_t *chan) +{ + tor_assert(chan); + + if (chan->is_listener) return chan->u.listener.n_accepted; + else return 0; +} + +/** + * Query received cell counter + * + * @param chan Channel to query + * @return Number of cells received by this channel + */ + +uint64_t +channel_count_recved(channel_t *chan) +{ + tor_assert(chan); + + if (!(chan->is_listener)) return chan->u.cell_chan.n_cells_recved; + else return 0; +} + +/** + * Query transmitted cell counter + * + * @param chan Channel to query + * @return Number of cells transmitted by this channel + */ + +uint64_t +channel_count_xmitted(channel_t *chan) +{ + tor_assert(chan); + + if (!(chan->is_listener)) return chan->u.cell_chan.n_cells_xmitted; + else return 0; +} + +/** * Check if a channel matches an extend_info_t * * This function calls the lower layer and asks if this channel matches a diff --git a/src/or/channel.h b/src/or/channel.h index 18d9a81..ed69b92 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -57,6 +57,10 @@ struct channel_s { void (*free)(channel_t *); /* Close an open channel */ void (*close)(channel_t *); + /* Describe the transport subclass for this channel */ + const char * (*describe_transport)(channel_t *); + /* Optional method to dump transport-specific statistics on the channel */ + void (*dumpstats)(channel_t *, int); union { struct { @@ -65,6 +69,12 @@ struct channel_s { /* List of pending incoming connections */ smartlist_t *incoming_list; + + /* Timestamps for listeners */ + time_t timestamp_accepted; + + /* Counters for listeners */ + uint64_t n_accepted; } listener; struct { /* Registered handlers for incoming cells */ @@ -127,12 +137,6 @@ struct channel_s { /* List of queued outgoing cells */ smartlist_t *outgoing_queue; - /* - * When we last used this conn for any client traffic. If not - * recent, we can rate limit it further. - */ - time_t client_used; - /* Circuit stuff for use by relay.c */ /* @@ -210,6 +214,10 @@ struct channel_s { * come over a circuit_t, which has a dirreq_id field as well, but is a * distinct namespace. */ uint64_t dirreq_id; + + /** Channel counters for cell channels */ + uint64_t n_cells_recved; + uint64_t n_cells_xmitted; } cell_chan; } u; }; @@ -257,6 +265,9 @@ void channel_run_cleanup(void); /* Close all channels and deallocate everything */ void channel_free_all(void); +/* Dump some statistics in the log */ +void channel_dumpstats(int severity); + #ifdef _TOR_CHANNEL_INTERNAL /* Channel operations for subclasses and internal use only */ @@ -297,6 +308,7 @@ void channel_set_remote_end(channel_t *chan, /* Timestamp updates */ void channel_timestamp_created(channel_t *chan); +void channel_timestamp_accepted(channel_t *chan); void channel_timestamp_active(channel_t *chan); void channel_timestamp_drained(channel_t *chan); void channel_timestamp_recv(channel_t *chan); @@ -368,6 +380,9 @@ channel_t * channel_prev_with_digest(channel_t *chan); * Metadata queries/updates */ +const char * channel_describe_transport(channel_t *chan); +void channel_dump_statistics(channel_t *chan, int severity); +void channel_dump_transport_statistics(channel_t *chan, int severity); const char * channel_get_actual_remote_descr(channel_t *chan); int channel_get_addr_if_possible(channel_t *chan, tor_addr_t *addr_out); const char * channel_get_canonical_remote_descr(channel_t *chan); @@ -389,11 +404,17 @@ void channel_timestamp_client(channel_t *chan); /* Timestamp queries */ time_t channel_when_created(channel_t *chan); +time_t channel_when_last_accepted(channel_t *chan); time_t channel_when_last_active(channel_t *chan); time_t channel_when_last_client(channel_t *chan); time_t channel_when_last_drained(channel_t *chan); time_t channel_when_last_recv(channel_t *chan); time_t channel_when_last_xmit(channel_t *chan); +/* Counter queries */ +uint64_t channel_count_accepted(channel_t *chan); +uint64_t channel_count_recved(channel_t *chan); +uint64_t channel_count_xmitted(channel_t *chan); + #endif diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 352037c..8a1b5eb 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -47,6 +47,7 @@ channel_tls_t *channel_tls_listener = NULL; /* channel_tls_t method declarations */ static void channel_tls_close_method(channel_t *chan); +static const char * channel_tls_describe_transport_method(channel_t *chan); static int channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out); static const char * @@ -104,6 +105,7 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, channel_init_for_cells(chan); chan->state = CHANNEL_STATE_OPENING; chan->close = channel_tls_close_method; + chan->describe_transport = channel_tls_describe_transport_method; chan->u.cell_chan.get_remote_addr = channel_tls_get_remote_addr_method; chan->u.cell_chan.get_remote_descr = channel_tls_get_remote_descr_method; chan->u.cell_chan.has_queued_writes = channel_tls_has_queued_writes_method; @@ -188,12 +190,15 @@ channel_tls_start_listener(void) channel_init_listener(lchan); lchan->state = CHANNEL_STATE_LISTENING; lchan->close = channel_tls_close_method; + lchan->describe_transport = channel_tls_describe_transport_method; channel_tls_listener = listener; log_debug(LD_CHANNEL, "Starting TLS listener channel %p with global id %lu", lchan, lchan->global_identifier); + + channel_register(lchan); } else lchan = TLS_CHAN_TO_BASE(channel_tls_listener); return lchan; @@ -245,6 +250,7 @@ channel_tls_handle_incoming(or_connection_t *orconn) channel_init_for_cells(chan); chan->state = CHANNEL_STATE_OPENING; chan->close = channel_tls_close_method; + chan->describe_transport = channel_tls_describe_transport_method; chan->u.cell_chan.get_remote_descr = channel_tls_get_remote_descr_method; chan->u.cell_chan.has_queued_writes = channel_tls_has_queued_writes_method; chan->u.cell_chan.is_canonical = channel_tls_is_canonical_method; @@ -335,6 +341,43 @@ channel_tls_close_method(channel_t *chan) } /** + * Describe the transport for a channel_tls_t + * + * This returns the string "TLS channel on connection <id>" to the upper + * layer. + */ + +static const char * +channel_tls_describe_transport_method(channel_t *chan) +{ + static char *buf = NULL; + uint64_t id; + channel_tls_t *tlschan; + const char *rv = NULL; + + tor_assert(chan); + + if (chan->is_listener) { + rv = "TLS channel (listening)"; + } else { + tlschan = BASE_CHAN_TO_TLS(chan); + + if (tlschan->conn) { + id = TO_CONN(tlschan->conn)->global_identifier; + + if (buf) tor_free(buf); + tor_asprintf(&buf, "TLS channel (connection %lu)", id); + + rv = buf; + } else { + rv = "TLS channel (no connection)"; + } + } + + return rv; +} + +/** * Get the remote address of a channel_tls_t * * This implements the get_remote_addr method for channel_tls_t; copy the diff --git a/src/or/main.c b/src/or/main.c index 908e490..2a3e0e1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2167,10 +2167,12 @@ dumpstats(int severity) } } } - /* TODO add dump for channels with circuit_dump_by_chan() */ circuit_dump_by_conn(conn, severity); /* dump info about all the circuits * using this conn */ } SMARTLIST_FOREACH_END(conn); + + channel_dumpstats(severity); + log(severity, LD_NET, "Cells processed: "U64_FORMAT" padding\n" " "U64_FORMAT" create\n"

1 0

[tor/master] Check return value from connection_or_connect() in channel_tls_connect()
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit 71ba517e0c557d0ae35af7a5f99c8756f336a416 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 18:24:04 2012 -0700 Check return value from connection_or_connect() in channel_tls_connect() It's possible for connection_or_connect() to fail and return NULL after it sets tlschan->conn, so not checking leaves a channel hanging around in CHANNEL_STATE_OPENING with a pointer to a freed or_connection_t forever. --- src/or/channeltls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 8a1b5eb..03792dd 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -129,7 +129,7 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, cell_ewma_get_tick(); /* Set up or_connection stuff */ - connection_or_connect(addr, port, id_digest, tlschan); + tlschan->conn = connection_or_connect(addr, port, id_digest, tlschan); /* connection_or_connect() will fill in tlschan->conn */ if (!(tlschan->conn)) { channel_change_state(chan, CHANNEL_STATE_ERROR);

1 0

[tor/master] channel_free() should be a no-op
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit 64e6f6687c8fc275ddc207fa43f29c4213d3cad2 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 19:50:41 2012 -0700 channel_free() should be a no-op --- src/or/channel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 2fe4466..690bfb9 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -763,7 +763,8 @@ channel_init_listener(channel_t *chan) void channel_free(channel_t *chan) { - tor_assert(chan); + if (!chan) return; + /* It must be closed or errored */ tor_assert(chan->state == CHANNEL_STATE_CLOSED || chan->state == CHANNEL_STATE_ERROR);

1 0

[tor/master] Simplify channel_find_by_remote_digest()
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit 341928c807b1d16383710b8b2728ed963746bb9d Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 19:53:05 2012 -0700 Simplify channel_find_by_remote_digest() --- src/or/channel.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 9b814bb..c5bf60d 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -596,14 +596,13 @@ channel_find_by_global_id(uint64_t global_identifier) channel_t * channel_find_by_remote_digest(const char *identity_digest) { - channel_t *rv = NULL, *tmp; + channel_t *rv = NULL; tor_assert(identity_digest); /* Search for it in the identity map */ if (channel_identity_map) { - tmp = digestmap_get(channel_identity_map, identity_digest); - rv = tmp; + rv = digestmap_get(channel_identity_map, identity_digest); } return rv;

1 0

[tor/master] Add changes file for channels (ticket 6465)
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit b1b33f15bed25b2dbbe1ddd3bc69fe18b2fb8ed4 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Thu Sep 13 05:56:21 2012 -0700 Add changes file for channels (ticket 6465) --- changes/bug6465 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/bug6465 b/changes/bug6465 new file mode 100644 index 0000000..a5ea9e2 --- /dev/null +++ b/changes/bug6465 @@ -0,0 +1,12 @@ + o Infrastructure features: + - Introduce new channel_t abstraction between circuits and or_connection_t + to allow for implementing alternate OR-to-OR transports. A channel_t is + an abstract object which can either be a cell-bearing channel, which is + responsible for authenticating and handshaking with the remote OR and + transmitting cells to and from it, or a listening channel, which spawns + new cell-bearing channels at the request of remote ORs. + + - Also new is the channel_tls_t subclass of channel_t, adapting it to the + existing or_connection_t code. The V2/V3 protocol handshaking code + which formerly resided in command.c has been moved below the channel_t + abstraction layer and may be found in channeltls.c now.

1 0

[tor/master] Use U64_FORMAT/U64_PRINTF_ARG rather than %lu for channel_t
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit e709fe320a872d8ddbeb62c029cec0246eeabc39 Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 19:48:06 2012 -0700 Use U64_FORMAT/U64_PRINTF_ARG rather than %lu for channel_t --- src/or/channel.c | 286 +++++++++++++++++++++++++++----------------------- src/or/channeltls.c | 18 ++-- src/or/circuitlist.c | 10 +- src/or/command.c | 6 +- src/or/cpuworker.c | 5 +- 5 files changed, 177 insertions(+), 148 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index cf08e3b..2fe4466 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -241,14 +241,15 @@ channel_register(channel_t *chan) if (chan->is_listener) { log_debug(LD_CHANNEL, - "Registering listener channel %p (ID %lu) in state %s (%d)", - chan, chan->global_identifier, + "Registering listener channel %p (ID " U64_FORMAT ") " + "in state %s (%d)", + chan, U64_PRINTF_ARG(chan->global_identifier), channel_state_to_string(chan->state), chan->state); } else { log_debug(LD_CHANNEL, - "Registering cell channel %p (ID %lu) in state %s (%d) " - "with digest %s", - chan, chan->global_identifier, + "Registering cell channel %p (ID " U64_FORMAT ") " + "in state %s (%d) with digest %s", + chan, U64_PRINTF_ARG(chan->global_identifier), channel_state_to_string(chan->state), chan->state, hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); } @@ -282,9 +283,9 @@ channel_register(channel_t *chan) channel_add_to_digest_map(chan); } else { log_info(LD_CHANNEL, - "Channel %p (global ID %lu) in state %s (%d) registered " - "with no identity digest", - chan, chan->global_identifier, + "Channel %p (global ID " U64_FORMAT ") " + "in state %s (%d) registered with no identity digest", + chan, U64_PRINTF_ARG(chan->global_identifier), channel_state_to_string(chan->state), chan->state); } } @@ -398,9 +399,9 @@ channel_add_to_digest_map(channel_t *chan) } log_debug(LD_CHANNEL, - "Added channel %p (%lu) to identity map in state %s (%d) " - "with digest %s", - chan, chan->global_identifier, + "Added channel %p (global ID " U64_FORMAT ") " + "to identity map in state %s (%d) with digest %s", + chan, U64_PRINTF_ARG(chan->global_identifier), channel_state_to_string(chan->state), chan->state, hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); } @@ -432,9 +433,10 @@ channel_remove_from_digest_map(channel_t *chan) * case is similar to digestmap_get() failing below. */ log_warn(LD_BUG, - "Trying to remove channel %p (%lu) with digest %s from " - "identity map, but didn't have any identity map", - chan, chan->global_identifier, + "Trying to remove channel %p (global ID " U64_FORMAT ") " + "with digest %s from identity map, but didn't have any identity " + "map", + chan, U64_PRINTF_ARG(chan->global_identifier), hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); /* Clear out its next/prev pointers */ if (chan->u.cell_chan.next_with_same_id) { @@ -496,18 +498,18 @@ channel_remove_from_digest_map(channel_t *chan) chan->u.cell_chan.prev_with_same_id = NULL; log_debug(LD_CHANNEL, - "Removed channel %p (%lu) from identity map in state %s (%d) " - "with digest %s", - chan, chan->global_identifier, + "Removed channel %p (global ID " U64_FORMAT ") from " + "identity map in state %s (%d) with digest %s", + chan, U64_PRINTF_ARG(chan->global_identifier), channel_state_to_string(chan->state), chan->state, hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); } else { /* This is not good */ log_warn(LD_BUG, - "Trying to remove channel %p (%lu) with digest %s from " - "identity map, but couldn't find it in the list for that " - "digest", - chan, chan->global_identifier, + "Trying to remove channel %p (global ID " U64_FORMAT ") " + "with digest %s from identity map, but couldn't find it in " + "the list for that digest", + chan, U64_PRINTF_ARG(chan->global_identifier), hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); /* Unlink it and hope for the best */ if (chan->u.cell_chan.next_with_same_id) { @@ -526,9 +528,10 @@ channel_remove_from_digest_map(channel_t *chan) } else { /* Shouldn't happen */ log_warn(LD_BUG, - "Trying to remove channel %p (%lu) with digest %s from " - "identity map, but couldn't find any with that digest", - chan, chan->global_identifier, + "Trying to remove channel %p (global ID " U64_FORMAT ") with " + "digest %s from identity map, but couldn't find any with " + "that digest", + chan, U64_PRINTF_ARG(chan->global_identifier), hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); /* Clear out its next/prev pointers */ if (chan->u.cell_chan.next_with_same_id) { @@ -1256,8 +1259,8 @@ channel_clear_identity_digest(channel_t *chan) log_debug(LD_CHANNEL, "Clearing remote endpoint digest on channel %p with " - "global ID %lu", - chan, chan->global_identifier); + "global ID " U64_FORMAT, + chan, U64_PRINTF_ARG(chan->global_identifier)); state_not_in_map = (chan->state == CHANNEL_STATE_LISTENING || @@ -1295,8 +1298,8 @@ channel_set_identity_digest(channel_t *chan, log_debug(LD_CHANNEL, "Setting remote endpoint digest on channel %p with " - "global ID %lu to digest %s", - chan, chan->global_identifier, + "global ID " U64_FORMAT " to digest %s", + chan, U64_PRINTF_ARG(chan->global_identifier), identity_digest ? hex_str(identity_digest, DIGEST_LEN) : "(null)"); @@ -1354,8 +1357,8 @@ channel_clear_remote_end(channel_t *chan) log_debug(LD_CHANNEL, "Clearing remote endpoint identity on channel %p with " - "global ID %lu", - chan, chan->global_identifier); + "global ID " U64_FORMAT, + chan, U64_PRINTF_ARG(chan->global_identifier)); state_not_in_map = (chan->state == CHANNEL_STATE_LISTENING || @@ -1396,8 +1399,8 @@ channel_set_remote_end(channel_t *chan, log_debug(LD_CHANNEL, "Setting remote endpoint identity on channel %p with " - "global ID %lu to nickname %s, digest %s", - chan, chan->global_identifier, + "global ID " U64_FORMAT " to nickname %s, digest %s", + chan, U64_PRINTF_ARG(chan->global_identifier), nickname ? nickname : "(null)", identity_digest ? hex_str(identity_digest, DIGEST_LEN) : "(null)"); @@ -1469,8 +1472,9 @@ channel_write_cell(channel_t *chan, cell_t *cell) chan->state == CHANNEL_STATE_MAINT); log_debug(LD_CHANNEL, - "Writing cell_t %p to channel %p with global ID %lu", - cell, chan, chan->global_identifier); + "Writing cell_t %p to channel %p with global ID " + U64_FORMAT, + cell, chan, U64_PRINTF_ARG(chan->global_identifier)); /* Increment the timestamp unless it's padding */ if (!(cell->command == CELL_PADDING || @@ -1532,8 +1536,10 @@ channel_write_packed_cell(channel_t *chan, packed_cell_t *packed_cell) chan->state == CHANNEL_STATE_MAINT); log_debug(LD_CHANNEL, - "Writing packed_cell_t %p to channel %p with global ID %lu", - packed_cell, chan, chan->global_identifier); + "Writing packed_cell_t %p to channel %p with global ID " + U64_FORMAT, + packed_cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); /* Increment the timestamp */ chan->u.cell_chan.timestamp_last_added_nonpadding = approx_time(); @@ -1594,8 +1600,10 @@ channel_write_var_cell(channel_t *chan, var_cell_t *var_cell) chan->state == CHANNEL_STATE_MAINT); log_debug(LD_CHANNEL, - "Writing var_cell_t %p to channel %p with global ID %lu", - var_cell, chan, chan->global_identifier); + "Writing var_cell_t %p to channel %p with global ID " + U64_FORMAT, + var_cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); /* Increment the timestamp unless it's padding */ if (!(var_cell->command == CELL_PADDING || @@ -2064,8 +2072,8 @@ channel_process_incoming(channel_t *listener) log_debug(LD_CHANNEL, "Processing queue of incoming connections for listening " - "channel %p (global ID %lu)", - listener, listener->global_identifier); + "channel %p (global ID " U64_FORMAT ")", + listener, U64_PRINTF_ARG(listener->global_identifier)); if (!(listener->u.listener.incoming_list)) return; @@ -2075,9 +2083,12 @@ channel_process_incoming(channel_t *listener) tor_assert(!(chan->is_listener)); log_debug(LD_CHANNEL, - "Handling incoming connection %p (%lu) for listener %p (%lu)", - chan, chan->global_identifier, - listener, listener->global_identifier); + "Handling incoming connection %p (" U64_FORMAT ") " + "for listener %p (" U64_FORMAT ")", + chan, + U64_PRINTF_ARG(chan->global_identifier), + listener, + U64_PRINTF_ARG(listener->global_identifier)); /* Make sure this is set correctly */ channel_mark_incoming(chan); listener->u.listener.listener(listener, chan); @@ -2524,8 +2535,9 @@ channel_free_all(void) /* Deregister and free it */ tor_assert(tmp); log_debug(LD_CHANNEL, - "Cleaning up finished channel %p (ID %lu) in state %s (%d)", - tmp, tmp->global_identifier, + "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); @@ -2545,8 +2557,9 @@ channel_free_all(void) /* Close, deregister and free it */ tor_assert(tmp); log_debug(LD_CHANNEL, - "Cleaning up listening channel %p (ID %lu) in state %s (%d)", - tmp, tmp->global_identifier, + "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); /* * We have to unregister first so we don't put it in finished_channels @@ -2570,8 +2583,9 @@ channel_free_all(void) /* Close, deregister and free it */ tor_assert(tmp); log_debug(LD_CHANNEL, - "Cleaning up active channel %p (ID %lu) in state %s (%d)", - tmp, tmp->global_identifier, + "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); /* * We have to unregister first so we don't put it in finished_channels @@ -2595,8 +2609,9 @@ channel_free_all(void) /* Close, deregister and free it */ tor_assert(tmp); log_debug(LD_CHANNEL, - "Cleaning up leftover channel %p (ID %lu) in state %s (%d)", - tmp, tmp->global_identifier, + "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 || @@ -2875,27 +2890,32 @@ channel_dump_statistics(channel_t *chan, int severity) age = (double)(now - chan->timestamp_created); log(severity, LD_GENERAL, - "Channel %lu (at %p) with transport %s is in state %s (%d) and %s", - chan->global_identifier, chan, + "Channel " U64_FORMAT " (at %p) with transport %s is in state " + "%s (%d) and %s", + U64_PRINTF_ARG(chan->global_identifier), chan, channel_describe_transport(chan), channel_state_to_string(chan->state), chan->state, chan->is_listener ? "listens for incoming connections" : "transports cells"); log(severity, LD_GENERAL, - " * Channel %lu was created at %lu (%lu seconds ago) and last active " - "at %lu (%lu seconds ago)", - chan->global_identifier, - chan->timestamp_created, now - chan->timestamp_created, - chan->timestamp_active, now - chan->timestamp_active); + " * Channel " U64_FORMAT " was created at " U64_FORMAT + " (" U64_FORMAT " seconds ago) " + "and last active at " U64_FORMAT " (" U64_FORMAT " seconds ago)", + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->timestamp_created), + U64_PRINTF_ARG(now - chan->timestamp_created), + U64_PRINTF_ARG(chan->timestamp_active), + U64_PRINTF_ARG(now - chan->timestamp_active)); if (chan->is_listener) { log(severity, LD_GENERAL, - " * Listener channel %lu last accepted an incoming channel at %lu " - "(%lu seconds ago) and has accepted %lu channels in total", - chan->global_identifier, - chan->u.listener.timestamp_accepted, - now - chan->u.listener.timestamp_accepted, - chan->u.listener.n_accepted); + " * Listener channel " U64_FORMAT " last accepted an incoming " + "channel at " U64_FORMAT " (" U64_FORMAT " seconds ago) " + "and has accepted " U64_FORMAT " channels in total", + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->u.listener.timestamp_accepted), + U64_PRINTF_ARG(now - chan->u.listener.timestamp_accepted), + U64_PRINTF_ARG(chan->u.listener.n_accepted)); /* * If it's sensible to do so, get the rate of incoming channels on this @@ -2907,15 +2927,15 @@ channel_dump_statistics(channel_t *chan, int severity) avg = (double)(chan->u.listener.n_accepted) / age; if (avg >= 1.0) { log(severity, LD_GENERAL, - " * Listener channel %lu has averaged %f incoming channels per " - "second", - chan->global_identifier, avg); + " * Listener channel " U64_FORMAT " has averaged %f incoming " + "channels per second", + U64_PRINTF_ARG(chan->global_identifier), avg); } else if (avg >= 0.0) { interval = 1.0 / avg; log(severity, LD_GENERAL, - " * Listener channel %lu has averaged %f seconds between " - "incoming channels", - chan->global_identifier, interval); + " * Listener channel " U64_FORMAT " has averaged %f seconds " + "between incoming channels", + U64_PRINTF_ARG(chan->global_identifier), interval); } } } else { @@ -2923,30 +2943,30 @@ channel_dump_statistics(channel_t *chan, int severity) if (!tor_digest_is_zero(chan->u.cell_chan.identity_digest)) { if (chan->u.cell_chan.nickname) { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu says it is connected to an OR " - "with digest %s and nickname %s", - chan->global_identifier, + " * Cell-bearing channel " U64_FORMAT " says it is connected " + "to an OR with digest %s and nickname %s", + U64_PRINTF_ARG(chan->global_identifier), hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN), chan->u.cell_chan.nickname); } else { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu says it is connected to an OR " - "with digest %s and no known nickname", - chan->global_identifier, + " * Cell-bearing channel " U64_FORMAT " says it is connected " + "to an OR with digest %s and no known nickname", + U64_PRINTF_ARG(chan->global_identifier), hex_str(chan->u.cell_chan.identity_digest, DIGEST_LEN)); } } else { if (chan->u.cell_chan.nickname) { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu does not know the digest of the " - "OR it is connected to, but reports its nickname is %s", - chan->global_identifier, + " * Cell-bearing channel " U64_FORMAT " does not know the digest" + " of the OR it is connected to, but reports its nickname is %s", + U64_PRINTF_ARG(chan->global_identifier), chan->u.cell_chan.nickname); } else { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu does not know the digest or the " - "nickname of the OR it is connected to", - chan->global_identifier); + " * Cell-bearing channel " U64_FORMAT " does not know the digest" + " or the nickname of the OR it is connected to", + U64_PRINTF_ARG(chan->global_identifier)); } } @@ -2955,29 +2975,29 @@ channel_dump_statistics(channel_t *chan, int severity) if (have_remote_addr) { remote_addr_str = tor_dup_addr(&remote_addr); log(severity, LD_GENERAL, - " * Cell-bearing channel %lu says its remote address is %s, " - "and gives a canonical description of \"%s\" and an " + " * Cell-bearing channel " U64_FORMAT " says its remote address" + " is %s, and gives a canonical description of \"%s\" and an " "actual description of \"%s\"", - chan->global_identifier, + U64_PRINTF_ARG(chan->global_identifier), remote_addr_str, channel_get_canonical_remote_descr(chan), channel_get_actual_remote_descr(chan)); tor_free(remote_addr_str); } else { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu does not know its remote address, " - "but gives a canonical description of \"%s\" and an " + " * Cell-bearing channel " U64_FORMAT " does not know its remote " + "address, but gives a canonical description of \"%s\" and an " "actual description of \"%s\"", - chan->global_identifier, + U64_PRINTF_ARG(chan->global_identifier), channel_get_canonical_remote_descr(chan), channel_get_actual_remote_descr(chan)); } /* Handle marks */ log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has these marks: %s %s %s " + " * Cell-bearing channel " U64_FORMAT " has these marks: %s %s %s " "%s %s %s", - chan->global_identifier, + U64_PRINTF_ARG(chan->global_identifier), channel_is_bad_for_new_circs(chan) ? "bad_for_new_circs" : "!bad_for_new_circs", channel_is_canonical(chan) ? @@ -2994,9 +3014,9 @@ channel_dump_statistics(channel_t *chan, int severity) /* Describe queues */ log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has %d queued incoming cells " - "and %d queued outgoing cells", - chan->global_identifier, + " * 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.outgoing_queue != NULL) ? @@ -3004,9 +3024,9 @@ channel_dump_statistics(channel_t *chan, int severity) /* Describe circuits */ log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has %d active circuits out of %d" - " in total", - chan->global_identifier, + " * Cell-bearing channel " U64_FORMAT " has %d active circuits out of" + " %d in total", + U64_PRINTF_ARG(chan->global_identifier), (chan->u.cell_chan.active_circuit_pqueue != NULL) ? smartlist_len(chan->u.cell_chan.active_circuit_pqueue) : 0, chan->u.cell_chan.n_circuits); @@ -3014,67 +3034,67 @@ channel_dump_statistics(channel_t *chan, int severity) /* Describe timestamps */ log(severity, LD_GENERAL, - " * Cell-bearing channel %lu was last used by a client at %lu " - "(%lu seconds ago)", - chan->global_identifier, - chan->u.cell_chan.timestamp_client, - now - chan->u.cell_chan.timestamp_client); + " * Cell-bearing channel " U64_FORMAT " was last used by a " + "client at " U64_FORMAT " (" U64_FORMAT " seconds ago)", + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->u.cell_chan.timestamp_client), + U64_PRINTF_ARG(now - chan->u.cell_chan.timestamp_client)); log(severity, LD_GENERAL, - " * Cell-bearing channel %lu was last drained at %lu " - "(%lu seconds ago)", - chan->global_identifier, - chan->u.cell_chan.timestamp_drained, - now - chan->u.cell_chan.timestamp_drained); + " * Cell-bearing channel " U64_FORMAT " was last drained at " + U64_FORMAT " (" U64_FORMAT " seconds ago)", + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->u.cell_chan.timestamp_drained), + U64_PRINTF_ARG(now - chan->u.cell_chan.timestamp_drained)); log(severity, LD_GENERAL, - " * Cell-bearing channel %lu last received a cell at %lu " - "(%lu seconds ago)", - chan->global_identifier, - chan->u.cell_chan.timestamp_recv, - now - chan->u.cell_chan.timestamp_recv); + " * Cell-bearing channel " U64_FORMAT " last received a cell " + "at " U64_FORMAT " (" U64_FORMAT " seconds ago)", + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->u.cell_chan.timestamp_recv), + U64_PRINTF_ARG(now - chan->u.cell_chan.timestamp_recv)); log(severity, LD_GENERAL, - " * Cell-bearing channel %lu last trasmitted a cell at %lu " - "(%lu seconds ago)", - chan->global_identifier, - chan->u.cell_chan.timestamp_xmit, - now - chan->u.cell_chan.timestamp_xmit); + " * Cell-bearing channel " U64_FORMAT " last trasmitted a cell " + "at " U64_FORMAT " (" U64_FORMAT " seconds ago)", + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->u.cell_chan.timestamp_xmit), + U64_PRINTF_ARG(now - chan->u.cell_chan.timestamp_xmit)); /* Describe counters and rates */ log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has received %lu cells and " - " transmitted %lu", - chan->global_identifier, - chan->u.cell_chan.n_cells_recved, - chan->u.cell_chan.n_cells_xmitted); + " * Cell-bearing channel " U64_FORMAT " has received " + U64_FORMAT " cells and transmitted " U64_FORMAT, + U64_PRINTF_ARG(chan->global_identifier), + U64_PRINTF_ARG(chan->u.cell_chan.n_cells_recved), + U64_PRINTF_ARG(chan->u.cell_chan.n_cells_xmitted)); if (now > chan->timestamp_created && chan->timestamp_created > 0) { if (chan->u.cell_chan.n_cells_recved > 0) { avg = (double)(chan->u.cell_chan.n_cells_recved) / age; if (avg >= 1.0) { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has averaged %f cells received " - "per second", - chan->global_identifier, avg); + " * Cell-bearing channel " U64_FORMAT " has averaged %f " + "cells received per second", + U64_PRINTF_ARG(chan->global_identifier), avg); } else if (avg >= 0.0) { interval = 1.0 / avg; log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has averaged %f seconds between " - "received cells", - chan->global_identifier, interval); + " * Cell-bearing channel " U64_FORMAT " has averaged %f " + "seconds between received cells", + U64_PRINTF_ARG(chan->global_identifier), interval); } } if (chan->u.cell_chan.n_cells_xmitted > 0) { avg = (double)(chan->u.cell_chan.n_cells_xmitted) / age; if (avg >= 1.0) { log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has averaged %f cells transmitted " - "per second", - chan->global_identifier, avg); + " * Cell-bearing channel " U64_FORMAT " has averaged %f " + "cells transmitted per second", + U64_PRINTF_ARG(chan->global_identifier), avg); } else if (avg >= 0.0) { interval = 1.0 / avg; log(severity, LD_GENERAL, - " * Cell-bearing channel %lu has averaged %f seconds between " - "transmitted cells", - chan->global_identifier, interval); + " * Cell-bearing channel " U64_FORMAT " has averaged %f " + "seconds between transmitted cells", + U64_PRINTF_ARG(chan->global_identifier), interval); } } } diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 03792dd..9fd7e6c 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -118,8 +118,10 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, chan->u.cell_chan.write_var_cell = channel_tls_write_var_cell_method; log_debug(LD_CHANNEL, - "In channel_tls_connect() for channel %p (global id %lu)", - tlschan, chan->global_identifier); + "In channel_tls_connect() for channel %p " + "(global id " U64_FORMAT ")", + tlschan, + U64_PRINTF_ARG(chan->global_identifier)); if (is_local_addr(addr)) channel_mark_local(chan); channel_mark_outgoing(chan); @@ -137,8 +139,8 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, } log_debug(LD_CHANNEL, - "Got orconn %p for channel with global id %lu", - tlschan->conn, chan->global_identifier); + "Got orconn %p for channel with global id " U64_FORMAT, + tlschan->conn, U64_PRINTF_ARG(chan->global_identifier)); goto done; @@ -195,8 +197,8 @@ channel_tls_start_listener(void) channel_tls_listener = listener; log_debug(LD_CHANNEL, - "Starting TLS listener channel %p with global id %lu", - lchan, lchan->global_identifier); + "Starting TLS listener channel %p with global id " U64_FORMAT, + lchan, U64_PRINTF_ARG(lchan->global_identifier)); channel_register(lchan); } else lchan = TLS_CHAN_TO_BASE(channel_tls_listener); @@ -366,7 +368,9 @@ channel_tls_describe_transport_method(channel_t *chan) id = TO_CONN(tlschan->conn)->global_identifier; if (buf) tor_free(buf); - tor_asprintf(&buf, "TLS channel (connection %lu)", id); + tor_asprintf(&buf, + "TLS channel (connection " U64_FORMAT ")", + U64_PRINTF_ARG(id)); rv = buf; } else { diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 4746f91..68cd19e 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -918,15 +918,17 @@ circuit_get_by_circid_channel_impl(circid_t circ_id, channel_t *chan) if (found && found->circuit) { log_debug(LD_CIRC, "circuit_get_by_circid_channel_impl() returning circuit %p for" - " circ_id %d, channel ID %lu (%p)", - found->circuit, circ_id, chan->global_identifier, chan); + " circ_id %d, channel ID " U64_FORMAT " (%p)", + found->circuit, circ_id, + U64_PRINTF_ARG(chan->global_identifier), chan); return found->circuit; } log_debug(LD_CIRC, "circuit_get_by_circid_channel_impl() found nothing for" - " circ_id %d, channel ID %lu (%p)", - circ_id, chan->global_identifier, chan); + " circ_id %d, channel ID " U64_FORMAT " (%p)", + circ_id, + U64_PRINTF_ARG(chan->global_identifier), chan); return NULL; /* The rest of this checks for bugs. Disabled by default. */ diff --git a/src/or/command.c b/src/or/command.c index c7a1b1a..351ab08 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -193,8 +193,10 @@ command_process_create_cell(cell_t *cell, channel_t *chan) tor_assert(!(chan->is_listener)); log_debug(LD_OR, - "Got a CREATE cell for circ_id %d on channel %lu (%p)", - cell->circ_id, chan->global_identifier, chan); + "Got a CREATE cell for circ_id %d on channel " U64_FORMAT + " (%p)", + cell->circ_id, + U64_PRINTF_ARG(chan->global_identifier), chan); if (we_are_hibernating()) { log_info(LD_OR, diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index a78518f..119892d 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -157,8 +157,9 @@ connection_cpu_process_inbuf(connection_t *conn) tag_unpack(buf, &chan_id, &circ_id); circ = NULL; log_debug(LD_OR, - "Unpacking cpuworker reply, chan_id is %lu, circ_id is %d", - chan_id, circ_id); + "Unpacking cpuworker reply, chan_id is " U64_FORMAT + ", circ_id is %d", + U64_PRINTF_ARG(chan_id), circ_id); p_chan = channel_find_by_global_id(chan_id); if (p_chan)

1 0

[tor/master] Abolish superfluous channel_find_by_remote_nickname()
by andrea＠torproject.org 10 Oct '12

10 Oct '12

commit 965c9de498ab7f6c7ce3dce133bb34456f3d668e Author: Andrea Shepard <andrea(a)torproject.org> Date: Mon Oct 8 19:52:04 2012 -0700 Abolish superfluous channel_find_by_remote_nickname() --- src/or/channel.c | 36 ------------------------------------ src/or/channel.h | 1 - 2 files changed, 0 insertions(+), 37 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 690bfb9..9b814bb 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -610,42 +610,6 @@ channel_find_by_remote_digest(const char *identity_digest) } /** - * Find channel by remote nickname - * - * This function looks up a channel by the nickname of the remote - * endpoint. It's possible that more than one channel to that endpoint - * nickname exists, but there is not currently any supported way to iterate - * them. Use digests. - * - * @param nickname A node nickname - * @return A channel pointer to a channel to a node with that nickname, or - * NULL if none is available. - */ - -channel_t * -channel_find_by_remote_nickname(const char *nickname) -{ - channel_t *rv = NULL; - - tor_assert(nickname); - - if (all_channels && smartlist_len(all_channels) > 0) { - SMARTLIST_FOREACH_BEGIN(all_channels, channel_t *, curr) { - if (!(curr->is_listener)) { - if (curr->u.cell_chan.nickname && - strncmp(curr->u.cell_chan.nickname, nickname, - MAX_NICKNAME_LEN) == 0) { - rv = curr; - break; - } - } - } SMARTLIST_FOREACH_END(curr); - } - - return rv; -} - -/** * Next channel with digest * * This function takes a channel and finds the next channel in the list diff --git a/src/or/channel.h b/src/or/channel.h index ed69b92..7075981 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -368,7 +368,6 @@ int channel_is_better(time_t now, channel_t * channel_find_by_global_id(uint64_t global_identifier); channel_t * channel_find_by_remote_digest(const char *identity_digest); -channel_t * channel_find_by_remote_nickname(const char *nickname); /** For things returned by channel_find_by_remote_digest(), walk the list. */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2012