July 2011 - tor-commits - lists.torproject.org

[torbrowser/master] bump tbb win to 1.3.25 and firefox to 3.6.18
by erinn＠torproject.org 11 Jul '11

11 Jul '11

commit 843fec9f63d7dbdd804899e701bf5195933ec162 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jul 11 17:35:54 2011 -0300 bump tbb win to 1.3.25 and firefox to 3.6.18 --- README | 13 +++++++++---- build-scripts/Makefile | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README b/README index ef0808e..2afd038 100644 --- a/README +++ b/README @@ -5,12 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.1.30 (with libevent-2.0.10-stable, zlib-1.2.5 and openssl-1.0.0d) +Tor 0.2.1.30 (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) Polipo 1.0.4.1 -FirefoxPortable 3.6.17 - \_ Firefox 3.6.17 +FirefoxPortable 3.6.18 + \_ Firefox 3.6.18 \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.4 + \_ HTTPS Everywhere 1.0.0development.4 PidginPortable 2.7.4 \_ Pidgin 2.7.5 \_ OTR 3.2 @@ -346,3 +346,8 @@ Changelog Update Libevent to 2.0.10-stable Update zlib to 1.2.5 Update OpenSSL to 1.0.0d + +1.3.25: Released 2011-06-11 + Update Firefox to 3.6.18 + Update Libevent to 2.0.12-stable + Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/build-scripts/Makefile b/build-scripts/Makefile index ad82762..97085bb 100644 --- a/build-scripts/Makefile +++ b/build-scripts/Makefile @@ -18,7 +18,7 @@ OPENSSL=/e/build/openssl-0.9.8p/ ## Versions TORBUTTON_VERSION=1.2.5 -FIREFOX_VERSION=3.6.17 +FIREFOX_VERSION=3.6.18 PIDGIN_VERSION=2.7.5 ## Location of bundle components @@ -49,7 +49,7 @@ DEST="Generic Bundle" NAME="Tor Browser" ## Version and name of the compressed bundle (also used for source) -VERSION=1.3.24 +VERSION=1.3.25 DEFAULT_COMPRESSED_BASENAME=tor-browser- IM_COMPRESSED_BASENAME=tor-im-browser- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[tor/master] Put hashes of all tor source files into or_sha1.i
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit eeedc5c13c51ea508280be7539a261520b715ff6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 18 00:54:04 2011 -0700 Put hashes of all tor source files into or_sha1.i --- changes/bug3427 | 4 ++++ src/or/Makefile.am | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug3427 b/changes/bug3427 new file mode 100644 index 0000000..267d4d4 --- /dev/null +++ b/changes/bug3427 @@ -0,0 +1,4 @@ + * Minor bugfixes: + - Make 'tor --digests' list hashes of all Tor source files. + Bugfix on 0.2.2.4-alpha; fixes bug 3427. + diff --git a/src/or/Makefile.am b/src/or/Makefile.am index a9ac3cd..8777639 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -72,11 +72,13 @@ micro-revision.i: FORCE mv micro-revision.tmp micro-revision.i; \ fi; true -or_sha1.i: $(tor_SOURCES) +or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(tor_SOURCES) | @SED@ -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ + @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES) | \ + @SED@ -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(tor_SOURCES) | @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ + @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES) | \ + @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \ touch or_sha1.i; \

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3427'
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit b55e31aeb453875728295de664383b12e76fefdc Merge: 42ff326 eeedc5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:32:58 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3427' changes/bug3427 | 4 ++++ src/or/Makefile.am | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] Rename and tweak nodelist_add_node_family() to add node
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit e158f8de4b487450adeb89de204898263f6a87a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 11:21:47 2011 -0400 Rename and tweak nodelist_add_node_family() to add node It's very easy for nodelist_add_node_family(sl,node) to accidentally add 'node', and kind of hard to make sure that it omits it. Instead of taking pains to leave 'node' out, let's instead make sure that we always include it. I also rename the function to nodelist_add_node_and_family, and audit its users so that they don't add the node itself any longer, since the function will take care of that for them. Resolves bug 2616, which was not actually a bug. --- src/or/circuitbuild.c | 14 +++++--------- src/or/nodelist.h | 2 +- src/or/routerlist.c | 35 ++++++++++++++++++++++------------- src/or/routerlist.h | 1 - 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 90d9280..df33557 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3102,13 +3102,11 @@ choose_good_middle_server(uint8_t purpose, log_debug(LD_CIRC, "Contemplating intermediate hop: random choice."); excluded = smartlist_create(); if ((r = build_state_get_exit_node(state))) { - smartlist_add(excluded, (void*) r); - nodelist_add_node_family(excluded, r); + nodelist_add_node_and_family(excluded, r); } for (i = 0, cpath = head; i < cur_len; ++i, cpath=cpath->next) { if ((r = node_get_by_id(cpath->extend_info->identity_digest))) { - smartlist_add(excluded, (void*)r); - nodelist_add_node_family(excluded, r); + nodelist_add_node_and_family(excluded, r); } } @@ -3152,8 +3150,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) if (state && (node = build_state_get_exit_node(state))) { /* Exclude the exit node from the state, if we have one. Also exclude its * family. */ - smartlist_add(excluded, (void*)node); - nodelist_add_node_family(excluded, node); + nodelist_add_node_and_family(excluded, node); } if (firewall_is_fascist_or()) { /* Exclude all ORs that we can't reach through our firewall */ @@ -3168,8 +3165,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) SMARTLIST_FOREACH(entry_guards, entry_guard_t *, entry, { if ((node = node_get_by_id(entry->identity))) { - smartlist_add(excluded, (void*)node); - nodelist_add_node_family(excluded, node); + nodelist_add_node_and_family(excluded, node); } }); } @@ -4094,7 +4090,7 @@ choose_random_entry(cpath_build_state_t *state) int preferred_min, consider_exit_family = 0; if (chosen_exit) { - nodelist_add_node_family(exit_family, chosen_exit); + nodelist_add_node_and_family(exit_family, chosen_exit); consider_exit_family = 1; } diff --git a/src/or/nodelist.h b/src/or/nodelist.h index 08f11da..bd2e639 100644 --- a/src/or/nodelist.h +++ b/src/or/nodelist.h @@ -53,7 +53,7 @@ smartlist_t *nodelist_get_list(void); /* XXXX These need to move out of routerlist.c */ void nodelist_refresh_countries(void); void node_set_country(node_t *node); -void nodelist_add_node_family(smartlist_t *nodes, const node_t *node); +void nodelist_add_node_and_family(smartlist_t *nodes, const node_t *node); int nodes_in_same_family(const node_t *node1, const node_t *node2); #endif diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5aaa4a9..c0a233c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1357,12 +1357,17 @@ addrs_in_same_network_family(const tor_addr_t *a1, return 0 == tor_addr_compare_masked(a1, a2, 16, CMP_SEMANTIC); } -/** Add all the family of router to the smartlist sl. - * This is used to make sure we don't pick siblings in a single path, - * or pick more than one relay from a family for our entry guard list. +/** + * Add all the family of node, including node itself, to + * the smartlist sl. + * + * This is used to make sure we don't pick siblings in a single path, or + * pick more than one relay from a family for our entry guard list. + * Note that a node may be added to sl more than once if it is + * part of node's family for more than one reason. */ void -nodelist_add_node_family(smartlist_t *sl, const node_t *node) +nodelist_add_node_and_family(smartlist_t *sl, const node_t *node) { /* XXXX MOVE */ const smartlist_t *all_nodes = nodelist_get_list(); @@ -1373,6 +1378,13 @@ nodelist_add_node_family(smartlist_t *sl, const node_t *node) declared_family = node_get_declared_family(node); + /* Let's make sure that we have the node itself, if it's a real node. */ + { + const node_t *real_node = node_get_by_id(node->identity); + if (real_node) + smartlist_add(sl, (node_t*)real_node); + } + /* First, add any nodes with similar network addresses. */ if (options->EnforceDistinctSubnets) { tor_addr_t node_addr; @@ -1417,13 +1429,14 @@ nodelist_add_node_family(smartlist_t *sl, const node_t *node) } } -/** Given a router, add every node_t in its family to sl. +/** Given a router, add every node_t in its family (including the + * node itself) to sl. * * Note the type mismatch: This function takes a routerinfo, but adds nodes * to the smartlist! */ static void -routerlist_add_nodes_in_family(smartlist_t *sl, const routerinfo_t *router) +routerlist_add_node_and_family(smartlist_t *sl, const routerinfo_t *router) { /* XXXX MOVE ? */ node_t fake_node; @@ -1434,7 +1447,7 @@ routerlist_add_nodes_in_family(smartlist_t *sl, const routerinfo_t *router) memcpy(fake_node.identity, router->cache_info.identity_digest, DIGEST_LEN); node = &fake_node; } - nodelist_add_node_family(sl, node); + nodelist_add_node_and_family(sl, node); } /** Return true iff node is named by some nickname in lst. */ @@ -2171,12 +2184,8 @@ router_choose_random_node(smartlist_t *excludedsmartlist, }); } - if ((r = routerlist_find_my_routerinfo())) { - const node_t *me = node_get_by_id(r->cache_info.identity_digest); - if (me) - smartlist_add(excludednodes, (void *)me); - routerlist_add_nodes_in_family(excludednodes, r); - } + if ((r = routerlist_find_my_routerinfo())) + routerlist_add_node_and_family(excludednodes, r); router_add_running_nodes_to_smartlist(sl, allow_invalid, need_uptime, need_capacity, diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 3a8af6f..1129046 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -36,7 +36,6 @@ const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type, int router_get_my_share_of_directory_requests(double *v2_share_out, double *v3_share_out); void router_reset_status_download_failures(void); -void routerlist_add_family(smartlist_t *sl, const routerinfo_t *router); int routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2); int router_nickname_is_in_list(const routerinfo_t *router, const char *list); const routerinfo_t *routerlist_find_my_routerinfo(void);

1 0

[tor/master] Merge branch 'bug2616'
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 42ff326afa2148f321ea7dce30e3008ff509ab35 Merge: e97eb6f e158f8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:22:12 2011 -0400 Merge branch 'bug2616' src/or/circuitbuild.c | 14 +++++--------- src/or/nodelist.h | 2 +- src/or/routerlist.c | 35 ++++++++++++++++++++++------------- src/or/routerlist.h | 1 - 4 files changed, 28 insertions(+), 24 deletions(-)

1 0

[tor/master] Record the states of failing OR connections
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 734d9486f62b0fb19c71cac7a484ae65091bd41d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 22 15:29:30 2011 -0400 Record the states of failing OR connections This code lets us record the state of any outgoing OR connection that fails before it becomes open, so we can notice if they're all dying in the same SSL state or the same OR handshake state. More work is still needed: - We need documentation - We need to actually call the code that reports the failure when we realize that we're having a hard time connecting out or making circuits. - We need to periodically clear out all this data -- perhaps, whenever we build a circuit successfully? - We'll eventually want to expose it to controllers, perhaps. Partial implementation of feature 3116. --- src/common/tortls.c | 31 ++++++++++++++ src/common/tortls.h | 1 + src/or/connection.c | 3 + src/or/connection_or.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/connection_or.h | 3 + 5 files changed, 144 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 94ca81b..8db47a6 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -222,6 +222,37 @@ ssl_state_to_string(int ssl_state) return buf; } +/** DOCDOC 3116 */ +void +tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) +{ + const char *ssl_state; + const char *tortls_state; + + if (PREDICT_UNLIKELY(!tls || !tls->ssl)) { + strlcpy(buf, "(No SSL object)", sz); + return; + } + + ssl_state = ssl_state_to_string(tls->ssl->state); + switch (tls->state) { +#define CASE(st) case TOR_TLS_ST_##st: tortls_state = #st ; break + CASE(HANDSHAKE); + CASE(OPEN); + CASE(GOTCLOSE); + CASE(SENTCLOSE); + CASE(CLOSED); + CASE(RENEGOTIATE); + CASE(BUFFEREVENT); +#undef CASE + default: + tortls_state = "unknown"; + break; + } + + tor_snprintf(buf, sz, "%s in %s", ssl_state, tortls_state); +} + void tor_tls_log_one_error(tor_tls_t *tls, unsigned long err, int severity, int domain, const char *doing) diff --git a/src/common/tortls.h b/src/common/tortls.h index ecb5bd2..9b8108b 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -48,6 +48,7 @@ typedef struct tor_tls_t tor_tls_t; #define TOR_TLS_IS_ERROR(rv) ((rv) < TOR_TLS_CLOSE) const char *tor_tls_err_to_string(int err); +void tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz); void tor_tls_free_all(void); int tor_tls_context_init(int is_public_server, diff --git a/src/or/connection.c b/src/or/connection.c index e8a17e7..b0e0f84 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -554,6 +554,9 @@ connection_free_all(void) /* Unlink everything from the identity map. */ connection_or_clear_identity_map(); + /* Clear out our list of broken connections */ + clear_broken_connection_map(); + SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); if (outgoing_addrs) { diff --git a/src/or/connection_or.c b/src/or/connection_or.c index fa86241..85df78b 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -150,6 +150,111 @@ connection_or_set_identity_digest(or_connection_t *conn, const char *digest) #endif } +/**************************************************************/ + +/** DOCDOC */ +static strmap_t *broken_connection_counts; + +/** DOCDOC */ +static void +note_broken_connection(const char *state) +{ + void *ptr; + intptr_t val; + if (!broken_connection_counts) + broken_connection_counts = strmap_new(); + + ptr = strmap_get(broken_connection_counts, state); + val = (intptr_t)ptr; + val++; + ptr = (void*)val; + strmap_set(broken_connection_counts, state, ptr); +} + +/** DOCDOC */ +void +clear_broken_connection_map(void) +{ + if (broken_connection_counts) + strmap_free(broken_connection_counts, NULL); + broken_connection_counts = NULL; +} + +/** DOCDOC */ +static void +connection_or_get_state_description(or_connection_t *orconn, + char *buf, size_t buflen) +{ + connection_t *conn = TO_CONN(orconn); + const char *conn_state; + char tls_state[256]; + + tor_assert(conn->type == CONN_TYPE_OR); + + conn_state = conn_state_to_string(conn->type, conn->state); + tor_tls_get_state_description(orconn->tls, tls_state, sizeof(tls_state)); + + tor_snprintf(buf, buflen, "%s with SSL state %s", conn_state, tls_state); +} + +/** DOCDOC */ +static void +connection_or_note_state_when_broken(or_connection_t *orconn) +{ + char buf[256]; + connection_or_get_state_description(orconn, buf, sizeof(buf)); + log_info(LD_HANDSHAKE,"Connection died in state '%s'", buf); + note_broken_connection(buf); +} + +/** DOCDOC */ +typedef struct broken_state_count_t { + intptr_t count; + const char *state; +} broken_state_count_t; + +/** DOCDOC */ +static int +broken_state_count_compare(const void **a_ptr, const void **b_ptr) +{ + const broken_state_count_t *a = *a_ptr, *b = *b_ptr; + return a->count - b->count; +} + +/** DOCDOC */ +void +connection_or_report_broken_states(int severity, int domain) +{ + int total = 0; + smartlist_t *items; + + if (!broken_connection_counts) { + log(severity, domain, "No broken connections reported"); + return; + } + items = smartlist_create(); + STRMAP_FOREACH(broken_connection_counts, state, void *, countptr) { + broken_state_count_t *c = tor_malloc(sizeof(broken_state_count_t)); + total += c->count = (intptr_t)countptr; + c->state = state; + smartlist_add(items, c); + } STRMAP_FOREACH_END; + + smartlist_sort(items, broken_state_count_compare); + + log(severity, domain, "%d connections have failed:", total); + + SMARTLIST_FOREACH_BEGIN(items, const broken_state_count_t *, c) { + log(severity, domain, + " %d connections died in state %s", (int)c->count, c->state); + } SMARTLIST_FOREACH_END(c); + + SMARTLIST_FOREACH(items, broken_state_count_t *, c, tor_free(c)); + smartlist_free(items); +} + +/**************************************************************/ + /** Pack the cell_t host-order structure src into network-order * in the buffer dest. See tor-spec.txt for details about the * wire format. @@ -364,6 +469,7 @@ connection_or_about_to_close(or_connection_t *or_conn) /* now mark things down as needed */ if (connection_or_nonopen_was_started_here(or_conn)) { const or_options_t *options = get_options(); + connection_or_note_state_when_broken(or_conn); rep_hist_note_connect_failed(or_conn->identity_digest, now); entry_guard_register_connect_status(or_conn->identity_digest,0, !options->HTTPSProxy, now); diff --git a/src/or/connection_or.h b/src/or/connection_or.h index f1acfd1..abcfe83 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -14,6 +14,7 @@ void connection_or_remove_from_identity_map(or_connection_t *conn); void connection_or_clear_identity_map(void); +void clear_broken_connection_map(void); or_connection_t *connection_or_get_for_extend(const char *digest, const tor_addr_t *target_addr, const char **msg_out, @@ -35,6 +36,8 @@ void connection_or_connect_failed(or_connection_t *conn, or_connection_t *connection_or_connect(const tor_addr_t *addr, uint16_t port, const char *id_digest); +void connection_or_report_broken_states(int severity, int domain); + int connection_tls_start_handshake(or_connection_t *conn, int receiving); int connection_tls_continue_handshake(or_connection_t *conn);

1 0

[tor/master] Report the states of failed TLS connections from bootstrap_problem
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit b0de8560f6f7b54c363226c11d277b6b08b1cbc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 14:29:29 2011 -0400 Report the states of failed TLS connections from bootstrap_problem --- changes/feature3116 | 5 +++++ src/or/control.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/changes/feature3116 b/changes/feature3116 new file mode 100644 index 0000000..386790c --- /dev/null +++ b/changes/feature3116 @@ -0,0 +1,5 @@ + o Major features: + - While we're trying to bootstrap, record how many TLS connections + fail in each state, and report which states saw the most failures + in response to any bootstrap failures. This feature may speed up + diagnosis of censorship events. diff --git a/src/or/control.c b/src/or/control.c index 6ea9dbe..fa0c6cf 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -18,6 +18,7 @@ #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "connection_or.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -4268,6 +4269,7 @@ control_event_bootstrap_problem(const char *warn, int reason) const char *tag, *summary; char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; + int severity; /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); @@ -4292,12 +4294,17 @@ control_event_bootstrap_problem(const char *warn, int reason) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */ - log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO, + severity = !strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO; + + log_fn(severity, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " "count %d; recommendation %s)", status, summary, warn, orconn_end_reason_to_control_string(reason), bootstrap_problems, recommendation); + + connection_or_report_broken_states(severity, LD_HANDSHAKE); + tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " "COUNT=%d RECOMMENDATION=%s",

1 0

[tor/master] Clear broken connection map on successful bootstrap
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit e253e9577fb7d76bd534b343f0f63559b9a47b4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 15:10:38 2011 -0400 Clear broken connection map on successful bootstrap --- src/or/circuitbuild.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fa7519d..6a411d1 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2117,6 +2117,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) "Looks like client functionality is working."); control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0); control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); + clear_broken_connection_map(); if (server_mode(options) && !check_whether_orport_reachable()) { inform_testing_reachability(); consider_testing_reachability(1, 1);

1 0

[tor/master] Document feature3116 fns and improve output
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 3f97c665aa8b0fee06b22160e3c10ef7d896618d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 15:06:56 2011 -0400 Document feature3116 fns and improve output - We were reporting the _bottom_ N failing states, not the top N. - With bufferevents enabled, we logged all TLS states as being "in bufferevent", which isn't actually informative. - When we had nothing to report, we reported nothing too loudly. - Also, we needed documentation. --- src/common/tortls.c | 13 ++++++++----- src/or/connection_or.c | 34 +++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 8db47a6..a208bc7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -222,7 +222,8 @@ ssl_state_to_string(int ssl_state) return buf; } -/** DOCDOC 3116 */ +/** Write a description of the current state of tls into the + * sz-byte buffer at buf. */ void tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) { @@ -236,21 +237,23 @@ tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) ssl_state = ssl_state_to_string(tls->ssl->state); switch (tls->state) { -#define CASE(st) case TOR_TLS_ST_##st: tortls_state = #st ; break +#define CASE(st) case TOR_TLS_ST_##st: tortls_state = " in "#st ; break CASE(HANDSHAKE); CASE(OPEN); CASE(GOTCLOSE); CASE(SENTCLOSE); CASE(CLOSED); CASE(RENEGOTIATE); - CASE(BUFFEREVENT); #undef CASE + case TOR_TLS_ST_BUFFEREVENT: + tortls_state = ""; + break; default: - tortls_state = "unknown"; + tortls_state = " in unknown TLS state"; break; } - tor_snprintf(buf, sz, "%s in %s", ssl_state, tortls_state); + tor_snprintf(buf, sz, "%s%s", ssl_state, tortls_state); } void diff --git a/src/or/connection_or.c b/src/or/connection_or.c index b5cd68a..e755c7e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -152,10 +152,13 @@ connection_or_set_identity_digest(or_connection_t *conn, const char *digest) /**************************************************************/ -/** DOCDOC */ +/** Map from a string describing what a non-open OR connection was doing when + * failed, to an intptr_t describing the count of connections that failed that + * way. Note that the count is stored _as_ the pointer. + */ static strmap_t *broken_connection_counts; -/** DOCDOC */ +/** Record that an OR connection failed in state. */ static void note_broken_connection(const char *state) { @@ -171,7 +174,7 @@ note_broken_connection(const char *state) strmap_set(broken_connection_counts, state, ptr); } -/** DOCDOC */ +/** Forget all recorded states for failed connections. */ void clear_broken_connection_map(void) { @@ -180,7 +183,10 @@ clear_broken_connection_map(void) broken_connection_counts = NULL; } -/** DOCDOC */ +/** Write a detailed description the state of orconn into the + * buflen-byte buffer at buf. This description includes not + * only the OR-conn level state but also the TLS state. It's useful for + * diagnosing broken handshakes. */ static void connection_or_get_state_description(or_connection_t *orconn, char *buf, size_t buflen) @@ -197,7 +203,8 @@ connection_or_get_state_description(or_connection_t *orconn, tor_snprintf(buf, buflen, "%s with SSL state %s", conn_state, tls_state); } -/** DOCDOC */ +/** Record the current state of orconn as the state of a broken + * connection. */ static void connection_or_note_state_when_broken(or_connection_t *orconn) { @@ -207,34 +214,35 @@ connection_or_note_state_when_broken(or_connection_t *orconn) note_broken_connection(buf); } -/** DOCDOC */ +/** Helper type used to sort connection states and find the most frequent. */ typedef struct broken_state_count_t { intptr_t count; const char *state; } broken_state_count_t; -/** DOCDOC */ +/** Helper function used to sort broken_state_count_t by frequency. */ static int broken_state_count_compare(const void **a_ptr, const void **b_ptr) { const broken_state_count_t *a = *a_ptr, *b = *b_ptr; - return a->count - b->count; + return b->count - a->count; } -/** DOCDOC */ +/** Upper limit on the number of different states to report for connection + * failure. */ #define MAX_REASONS_TO_REPORT 10 -/** DOCDOC */ +/** Report a list of the top states for failed OR connections at log level + * severity, in log domain domain. */ void connection_or_report_broken_states(int severity, int domain) { int total = 0; smartlist_t *items; - if (!broken_connection_counts) { - log(severity, domain, "No broken connections reported"); + if (!broken_connection_counts) return; - } + items = smartlist_create(); STRMAP_FOREACH(broken_connection_counts, state, void *, countptr) { broken_state_count_t *c = tor_malloc(sizeof(broken_state_count_t));

1 0

[tor/master] Disable recording new broken conns when we have bootstrapped
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 2a594fcde94ada2ef38d33d306b7df189a5e495c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:10:24 2011 -0400 Disable recording new broken conns when we have bootstrapped Rationale: right now there seems to be no way for our bootstrap status to dip under 100% once it has reached 100%. Thus, recording broken connections after that point is useless, and wastes memory. If at some point in the future we allow our bootstrap level to go backwards, then we should change this rule so that we disable recording broken connection states _as long as_ the bootstrap status is 100%. --- src/or/circuitbuild.c | 2 +- src/or/connection.c | 2 +- src/or/connection_or.c | 17 ++++++++++++++--- src/or/connection_or.h | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6a411d1..0e1dd52 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2117,7 +2117,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) "Looks like client functionality is working."); control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0); control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); - clear_broken_connection_map(); + clear_broken_connection_map(1); if (server_mode(options) && !check_whether_orport_reachable()) { inform_testing_reachability(); consider_testing_reachability(1, 1); diff --git a/src/or/connection.c b/src/or/connection.c index b0e0f84..d82a66e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -555,7 +555,7 @@ connection_free_all(void) connection_or_clear_identity_map(); /* Clear out our list of broken connections */ - clear_broken_connection_map(); + clear_broken_connection_map(0); SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e755c7e..94f8e22 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -158,12 +158,18 @@ connection_or_set_identity_digest(or_connection_t *conn, const char *digest) */ static strmap_t *broken_connection_counts; +/** If true, do not record information in broken_connection_counts. */ +static int disable_broken_connection_counts = 0; + /** Record that an OR connection failed in state. */ static void note_broken_connection(const char *state) { void *ptr; intptr_t val; + if (disable_broken_connection_counts) + return; + if (!broken_connection_counts) broken_connection_counts = strmap_new(); @@ -174,13 +180,16 @@ note_broken_connection(const char *state) strmap_set(broken_connection_counts, state, ptr); } -/** Forget all recorded states for failed connections. */ +/** Forget all recorded states for failed connections. If + * stop_recording is true, don't record any more. */ void -clear_broken_connection_map(void) +clear_broken_connection_map(int stop_recording) { if (broken_connection_counts) strmap_free(broken_connection_counts, NULL); broken_connection_counts = NULL; + if (stop_recording) + disable_broken_connection_counts = 1; } /** Write a detailed description the state of orconn into the @@ -209,6 +218,8 @@ static void connection_or_note_state_when_broken(or_connection_t *orconn) { char buf[256]; + if (disable_broken_connection_counts) + return; connection_or_get_state_description(orconn, buf, sizeof(buf)); log_info(LD_HANDSHAKE,"Connection died in state '%s'", buf); note_broken_connection(buf); @@ -240,7 +251,7 @@ connection_or_report_broken_states(int severity, int domain) int total = 0; smartlist_t *items; - if (!broken_connection_counts) + if (!broken_connection_counts || disable_broken_connection_counts) return; items = smartlist_create(); diff --git a/src/or/connection_or.h b/src/or/connection_or.h index abcfe83..072edbd 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -14,7 +14,7 @@ void connection_or_remove_from_identity_map(or_connection_t *conn); void connection_or_clear_identity_map(void); -void clear_broken_connection_map(void); +void clear_broken_connection_map(int disable); or_connection_t *connection_or_get_for_extend(const char *digest, const tor_addr_t *target_addr, const char **msg_out,

1 0