May 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 19 May '16

19 May '16

commit c4b7b4ad4ba35b724fa90012adafd62e48ed7e42 Merge: 1e97b6a 7c7d990 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:29:52 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug18809 | 2 +- src/test/test_dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.8] Fix a compilation error in test_dir.c
by nickm＠torproject.org 19 May '16

19 May '16

commit 06803c317f3865b2a365c4485618828f60bd5de9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:27:11 2016 -0400 Fix a compilation error in test_dir.c --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c806527..eca3082 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4213,7 +4213,7 @@ test_dir_find_dl_schedule(void* data) /* where arg is a string constant */ #define DIR_ARG(name,flags,arg) \ - { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, arg } + { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, (void*) arg } struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames),

1 0

[tor/release-0.2.8] changelog typo fix
by nickm＠torproject.org 19 May '16

19 May '16

commit 7c7d990704219ff1033dc9dc257378757ad7cecf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:29:45 2016 -0400 changelog typo fix --- changes/bug18809 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug18809 b/changes/bug18809 index 6ee5088..94e6369 100644 --- a/changes/bug18809 +++ b/changes/bug18809 @@ -7,7 +7,7 @@ - Fix some edge cases where consensus download connections may not have been closed, even though they were not needed. - Make relays retry consensus downloads the correct number of - times, rather than the more aggresive client retry count. + times, rather than the more aggressive client retry count. - Stop downloading consensuses when we have a consensus, even if we don't have all the certificates for it yet. Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha,

1 0

[tor/master] simplify more -- we only call these funcs when bootstrapping
by nickm＠torproject.org 19 May '16

19 May '16

commit d5a96286c2877ab56455ea5183d1df2e39453cde Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 14 02:29:12 2016 -0400 simplify more -- we only call these funcs when bootstrapping --- src/or/networkstatus.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3b38c07..6b40852 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -121,8 +121,7 @@ static int have_warned_about_new_version = 0; static void routerstatus_list_update_named_server_map(void); static void update_consensus_bootstrap_multiple_downloads( time_t now, - const or_options_t *options, - int we_are_bootstrapping); + const or_options_t *options); /** Forget that we've warned about anything networkstatus-related, so we will * give fresh warnings if the same behavior happens again. */ @@ -869,8 +868,7 @@ update_consensus_networkstatus_downloads(time_t now) continue; /* Make multiple connections for a bootstrap consensus download. */ - update_consensus_bootstrap_multiple_downloads(now, options, - we_are_bootstrapping); + update_consensus_bootstrap_multiple_downloads(now, options); } else { /* Check if we failed downloading a consensus too recently */ int max_dl_tries = consensus_max_download_tries(options, @@ -909,12 +907,10 @@ static void update_consensus_bootstrap_attempt_downloads( time_t now, const or_options_t *options, - int we_are_bootstrapping, download_status_t *dls, download_want_authority_t want_authority) { - int max_dl_tries = consensus_max_download_tries(options, - we_are_bootstrapping); + int max_dl_tries = consensus_max_download_tries(options, 1); const char *resource = networkstatus_get_flavor_name( usable_consensus_flavor()); @@ -947,8 +943,7 @@ update_consensus_bootstrap_attempt_downloads( */ static void update_consensus_bootstrap_multiple_downloads(time_t now, - const or_options_t *options, - int we_are_bootstrapping) + const or_options_t *options) { const int usable_flavor = usable_consensus_flavor(); @@ -957,12 +952,6 @@ update_consensus_bootstrap_multiple_downloads(time_t now, return; } - /* If we've managed to validate a usable consensus, don't make additional - * connections. */ - if (!we_are_bootstrapping) { - return; - } - /* Launch concurrent consensus download attempt(s) based on the mirror and * authority schedules. Try the mirror first - this makes it slightly more * likely that we'll connect to the fallback first, and then end the @@ -981,8 +970,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now, if (!check_consensus_waiting_for_certs(usable_flavor, now, dls_f)) { /* During bootstrap, DL_WANT_ANY_DIRSERVER means "use fallbacks". */ - update_consensus_bootstrap_attempt_downloads(now, options, - we_are_bootstrapping, dls_f, + update_consensus_bootstrap_attempt_downloads(now, options, dls_f, DL_WANT_ANY_DIRSERVER); } } @@ -992,8 +980,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now, &consensus_bootstrap_dl_status[CONSENSUS_BOOTSTRAP_SOURCE_AUTHORITY]; if (!check_consensus_waiting_for_certs(usable_flavor, now, dls_a)) { - update_consensus_bootstrap_attempt_downloads(now, options, - we_are_bootstrapping, dls_a, + update_consensus_bootstrap_attempt_downloads(now, options, dls_a, DL_WANT_AUTHORITY); } }

1 0

[tor/master] get rid of the scattered checks to cancel a consensus fetch
by nickm＠torproject.org 19 May '16

19 May '16

commit e230e80ab3021caf8153d2ba09bab5cb185366dc Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 03:05:54 2016 -0400 get rid of the scattered checks to cancel a consensus fetch We'll back off from the request in connection_ap_handshake_attach_circuit, or cancel it in connection_dir_close_consensus_fetches, and those are the only places we need to check. --- src/or/directory.c | 104 ----------------------------------------------------- src/or/directory.h | 2 -- 2 files changed, 106 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 02db035..2008d07 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1219,11 +1219,6 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, conn->base_.state = DIR_CONN_STATE_CLIENT_SENDING; /* fall through */ case 0: - /* Close this connection if there's another consensus connection - * downloading (during bootstrap), or connecting (after bootstrap). */ - if (connection_dir_close_consensus_conn_if_extra(conn)) { - return; - } /* queue the command on the outbuf */ directory_send_command(conn, dir_purpose, 1, resource, payload, payload_len, @@ -1271,11 +1266,6 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, connection_mark_for_close(TO_CONN(conn)); return; } - /* Close this connection if there's another consensus connection - * downloading (during bootstrap), or connecting (after bootstrap). */ - if (connection_dir_close_consensus_conn_if_extra(conn)) { - return; - } conn->base_.state = DIR_CONN_STATE_CLIENT_SENDING; /* queue the command on the outbuf */ directory_send_command(conn, dir_purpose, 0, resource, @@ -3686,41 +3676,6 @@ connection_dir_finished_flushing(dir_connection_t *conn) return 0; } -/* A helper function for connection_dir_close_consensus_conn_if_extra() - * that returns 0 if - * we can't have, or don't want to close, excess consensus connections. */ -STATIC int -connection_dir_would_close_consensus_conn_helper(void) -{ - const or_options_t *options = get_options(); - - /* we're only interested in closing excess connections if we could - * have created any in the first place */ - if (!networkstatus_consensus_can_use_multiple_directories(options)) { - return 0; - } - - /* We want to close excess connections downloading a consensus. - * If there aren't any excess, we don't have anything to close. */ - if (!networkstatus_consensus_has_excess_connections()) { - return 0; - } - - /* If we have excess connections, but none of them are downloading a - * consensus, and we are still bootstrapping (that is, we have no usable - * consensus), we don't want to close any until one starts downloading. */ - if (!networkstatus_consensus_is_downloading_usable_flavor() - && networkstatus_consensus_is_bootstrapping(time(NULL))) { - return 0; - } - - /* If we have just stopped bootstrapping (that is, just parsed a consensus), - * we might still have some excess connections hanging around. So we still - * have to check if we want to close any, even if we've stopped - * bootstrapping. */ - return 1; -} - /* Check if we would close excess consensus connections. If we would, any * new consensus connection would become excess immediately, so return 1. * Otherwise, return 0. */ @@ -3751,59 +3706,6 @@ connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose) return 0; } -/* Check if we have more than one consensus download connection attempt, and - * close conn: - * - if we don't have a consensus, and we're downloading a consensus, and conn - * is not downloading a consensus yet; - * - if we do have a consensus, and there's more than one consensus connection. - * - * Post-bootstrap consensus connection attempts are initiated one at a time. - * So this function won't close any consensus connection attempts that - * are initiated after bootstrap. - */ -int -connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn) -{ - tor_assert(conn); - tor_assert(conn->base_.type == CONN_TYPE_DIR); - - /* We're not interested in connections that aren't fetching a consensus. */ - if (conn->base_.purpose != DIR_PURPOSE_FETCH_CONSENSUS) { - return 0; - } - - /* The connection has already been closed */ - if (conn->base_.marked_for_close) { - return 0; - } - - /* Only close this connection if there's another consensus connection - * downloading (during bootstrap), or connecting (after bootstrap). - * Post-bootstrap consensus connection attempts won't be closed, because - * they only occur one at a time. */ - if (!connection_dir_would_close_consensus_conn_helper()) { - return 0; - } - - const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( - time(NULL)); - - /* We don't want to check other connections to see if they are downloading, - * as this is prone to race-conditions. So leave it for - * connection_dir_close_extra_consensus_conns(() to clean up. - * - * But if conn has just started connecting, or we have a consensus already, - * we can be sure it's not needed any more. */ - if (!we_are_bootstrapping - || conn->base_.state == DIR_CONN_STATE_CONNECTING) { - connection_close_immediate(&conn->base_); - connection_mark_for_close(&conn->base_); - return -1; - } - - return 0; -} - /* We just got a new consensus! If there are other in-progress requests * for this consensus flavor (for example because we launched several in * parallel), cancel them. @@ -3847,12 +3749,6 @@ connection_dir_finished_connecting(dir_connection_t *conn) log_debug(LD_HTTP,"Dir connection to router %s:%u established.", conn->base_.address,conn->base_.port); - /* Close this connection if there's another consensus connection - * downloading (during bootstrap), or connecting (after bootstrap). */ - if (connection_dir_close_consensus_conn_if_extra(conn)) { - return -1; - } - /* start flushing conn */ conn->base_.state = DIR_CONN_STATE_CLIENT_SENDING; return 0; diff --git a/src/or/directory.h b/src/or/directory.h index 9a17474..3254e07 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -79,7 +79,6 @@ void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, const char *payload, size_t payload_len, time_t if_modified_since); int connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose); -int connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn); #define DSR_HEX (1<<0) #define DSR_BASE64 (1<<1) @@ -146,7 +145,6 @@ STATIC int directory_handle_command_get(dir_connection_t *conn, const char *headers, const char *req_body, size_t req_body_len); -STATIC int connection_dir_would_close_consensus_conn_helper(void); STATIC int download_status_schedule_get_delay(download_status_t *dls, const smartlist_t *schedule, time_t now);

1 0

[tor/master] remove some more unused code
by nickm＠torproject.org 19 May '16

19 May '16

commit c98fbd4169d70033c5058994cab5cfbd24cf4e78 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 14 02:18:25 2016 -0400 remove some more unused code --- src/or/connection.c | 45 --------------------------------------------- src/or/connection.h | 7 ------- 2 files changed, 52 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 118e239..4fbbaf1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4438,32 +4438,6 @@ connection_get_by_type_state_rendquery(int type, int state, )); } -#define CONN_FIRST_AND_FREE_TEMPLATE(sl) \ - STMT_BEGIN \ - if (smartlist_len(sl) > 0) { \ - void *first_item = smartlist_get(sl, 0); \ - smartlist_free(sl); \ - return first_item; \ - } else { \ - smartlist_free(sl); \ - return NULL; \ - } \ - STMT_END - -/** Return a directory connection (if any one exists) that is fetching - * the item described by purpose/resource, otherwise return NULL. - */ -dir_connection_t * -connection_dir_get_by_purpose_and_resource( - int purpose, - const char *resource) -{ - smartlist_t *conns = connection_dir_list_by_purpose_and_resource( - purpose, - resource); - CONN_FIRST_AND_FREE_TEMPLATE(conns); -} - /** Return a new smartlist of dir_connection_t * from get_connection_array() * that satisfy conn_test on connection_t *conn_var, and dirconn_test on * dir_connection_t *dirconn_var. conn_var must be of CONN_TYPE_DIR and not @@ -4504,25 +4478,6 @@ connection_dir_list_by_purpose_and_resource( dirconn->requested_resource)); } -/** Return a directory connection (if any one exists) that is fetching - * the item described by purpose/resource/state, - * otherwise return NULL. */ -dir_connection_t * -connection_dir_get_by_purpose_resource_and_state( - int purpose, - const char *resource, - int state) -{ - smartlist_t *conns = - connection_dir_list_by_purpose_resource_and_state( - purpose, - resource, - state); - CONN_FIRST_AND_FREE_TEMPLATE(conns); -} - -#undef CONN_FIRST_AND_FREE_TEMPLATE - /** Return a list of directory connections that are fetching the item * described by purpose/resource/state. If there are * none, return an empty list. This list must be freed using smartlist_free, diff --git a/src/or/connection.h b/src/or/connection.h index 45175cd..4835235 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -192,13 +192,6 @@ MOCK_DECL(connection_t *,connection_get_by_type_addr_port_purpose,(int type, connection_t *connection_get_by_type_state(int type, int state); connection_t *connection_get_by_type_state_rendquery(int type, int state, const char *rendquery); -dir_connection_t *connection_dir_get_by_purpose_and_resource( - int purpose, - const char *resource); -dir_connection_t *connection_dir_get_by_purpose_resource_and_state( - int purpose, - const char *resource, - int state); smartlist_t *connection_dir_list_by_purpose_and_resource( int purpose, const char *resource);

1 0

[tor/master] Changes file for bug 18809
by nickm＠torproject.org 19 May '16

19 May '16

commit 8dc8d712260a16eb9811b57abd4928081316f495 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 18 18:04:02 2016 -0400 Changes file for bug 18809 --- changes/bug18809 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/changes/bug18809 b/changes/bug18809 new file mode 100644 index 0000000..6ee5088 --- /dev/null +++ b/changes/bug18809 @@ -0,0 +1,14 @@ + o Major bugfixes (bootstrap): + - Check if bootstrap consensus downloads are still needed + when the linked connection attaches. This prevents tor + making unnecessary begindir-style connections, which are + the only directory connections tor clients make since + #18483 was merged. + - Fix some edge cases where consensus download connections + may not have been closed, even though they were not needed. + - Make relays retry consensus downloads the correct number of + times, rather than the more aggresive client retry count. + - Stop downloading consensuses when we have a consensus, + even if we don't have all the certificates for it yet. + Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha, + patches by arma and teor.

1 0

[tor/master] stop looping once we know what the answer will be
by nickm＠torproject.org 19 May '16

19 May '16

commit aa6341d4b9159e02825a03f1490ce6b731c2a90e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 6 09:55:06 2016 -0400 stop looping once we know what the answer will be suggested during code review by dgoulet --- src/or/networkstatus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3d8bb55..074922b 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1347,8 +1347,10 @@ networkstatus_consensus_is_already_downloading(const char *resource) connection_t *base = TO_CONN(dirconn); if (base->linked_conn && base->linked_conn->type == CONN_TYPE_AP && - !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) + !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) { answer = 1; + break; /* stop looping, because we know the answer will be yes */ + } } SMARTLIST_FOREACH_END(dirconn); smartlist_free(fetching_conns);

1 0

[tor/master] fix a bug where relays would use the aggressive client bootstrapping retry number
by nickm＠torproject.org 19 May '16

19 May '16

commit 1f72653544272e24d685bd81abe2da5d32b67caf Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 14 03:03:47 2016 -0400 fix a bug where relays would use the aggressive client bootstrapping retry number --- src/or/networkstatus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 6b40852..3d8bb55 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -871,8 +871,7 @@ update_consensus_networkstatus_downloads(time_t now) update_consensus_bootstrap_multiple_downloads(now, options); } else { /* Check if we failed downloading a consensus too recently */ - int max_dl_tries = consensus_max_download_tries(options, - we_are_bootstrapping); + int max_dl_tries = consensus_max_download_tries(options, 0); /* Let's make sure we remembered to update consensus_dl_status */ tor_assert(consensus_dl_status[i].schedule == DL_SCHED_CONSENSUS);

1 0

[tor/master] avoid another redundant check
by nickm＠torproject.org 19 May '16

19 May '16

commit bcae392e0edc682990da71524a0802cf79e3e698 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 03:13:12 2016 -0400 avoid another redundant check we should avoid launching a consensus fetch if we don't want one, but if we do end up with an extra one, we should let the other checks take care of it. --- src/or/directory.c | 39 +-------------------------------------- src/or/directory.h | 1 - src/or/networkstatus.c | 9 --------- src/or/networkstatus.h | 1 - 4 files changed, 1 insertion(+), 49 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 2008d07..89b0822 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1173,12 +1173,6 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, return; } - /* ensure we don't make excess connections when we're already downloading - * a consensus during bootstrap */ - if (connection_dir_avoid_extra_connection_for_purpose(dir_purpose)) { - return; - } - conn = dir_connection_new(tor_addr_family(&addr)); /* set up conn so it's got all the data we need to remember */ @@ -3676,36 +3670,6 @@ connection_dir_finished_flushing(dir_connection_t *conn) return 0; } -/* Check if we would close excess consensus connections. If we would, any - * new consensus connection would become excess immediately, so return 1. - * Otherwise, return 0. */ -int -connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose) -{ - const or_options_t *options = get_options(); - - /* We're not interested in connections that aren't fetching a consensus. */ - if (purpose != DIR_PURPOSE_FETCH_CONSENSUS) { - return 0; - } - - /* we're only interested in avoiding excess connections if we could - * have created any in the first place */ - if (!networkstatus_consensus_can_use_multiple_directories(options)) { - return 0; - } - - /* If there are connections downloading a consensus, and we are still - * bootstrapping (that is, we have no usable consensus), we can be sure that - * any further connections would be excess. */ - if (networkstatus_consensus_is_downloading_usable_flavor() - && networkstatus_consensus_is_bootstrapping(time(NULL))) { - return 1; - } - - return 0; -} - /* We just got a new consensus! If there are other in-progress requests * for this consensus flavor (for example because we launched several in * parallel), cancel them. @@ -3736,8 +3700,7 @@ connection_dir_close_consensus_fetches(dir_connection_t *except_this_one, } /** Connected handler for directory connections: begin sending data to the - * server, and return 0, or, if the connection is an excess bootstrap - * connection, close all excess bootstrap connections. + * server, and return 0. * Only used when connections don't immediately connect. */ int connection_dir_finished_connecting(dir_connection_t *conn) diff --git a/src/or/directory.h b/src/or/directory.h index 3254e07..7646cac 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -78,7 +78,6 @@ void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, const char *resource, const char *payload, size_t payload_len, time_t if_modified_since); -int connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose); #define DSR_HEX (1<<0) #define DSR_BASE64 (1<<1) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4a9b367..3b38c07 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1369,15 +1369,6 @@ networkstatus_consensus_is_already_downloading(const char *resource) return answer; } -/* Is tor currently downloading a consensus of the usable flavor? */ -int -networkstatus_consensus_is_downloading_usable_flavor(void) -{ - const char *resource = - networkstatus_get_flavor_name(usable_consensus_flavor()); - return networkstatus_consensus_is_already_downloading(resource); -} - /** Given two router status entries for the same router identity, return 1 if * if the contents have changed between them. Otherwise, return 0. */ static int diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index e1cd10b..667bc1f 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -77,7 +77,6 @@ int networkstatus_consensus_can_use_extra_fallbacks( const or_options_t *options); int networkstatus_consensus_has_excess_connections(void); int networkstatus_consensus_is_already_downloading(const char *resource); -int networkstatus_consensus_is_downloading_usable_flavor(void); #define NSSET_FROM_CACHE 1 #define NSSET_WAS_WAITING_FOR_CERTS 2

1 0