January 2015 - tor-commits - lists.torproject.org

[tor/master] Refactor initiate_descriptor_downloads() to be safer
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 21d5dbd474d5dad10a2bfa800df078f7fdc8c40b Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Sep 23 12:21:08 2014 -0400 Refactor initiate_descriptor_downloads() to be safer (It's smarter to use asprintf and join than character pointers and a long buffer.) --- src/or/routerlist.c | 46 +++++++++++++++++++++++----------------------- src/or/routerlist.h | 4 ++++ 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2fe007d..96814ca 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4289,18 +4289,13 @@ list_pending_fpsk_downloads(fp_pair_map_t *result) * range.) If source is given, download from source; * otherwise, download from an appropriate random directory server. */ -static void -initiate_descriptor_downloads(const routerstatus_t *source, - int purpose, - smartlist_t *digests, - int lo, int hi, int pds_flags) +MOCK_IMPL(STATIC void, initiate_descriptor_downloads, + (const routerstatus_t *source, int purpose, smartlist_t *digests, + int lo, int hi, int pds_flags)) { - int i, n = hi-lo; char *resource, *cp; - size_t r_len; - int digest_len = DIGEST_LEN, enc_digest_len = HEX_DIGEST_LEN; - char sep = '+'; + char *sep = "+"; int b64_256 = 0; if (purpose == DIR_PURPOSE_FETCH_MICRODESC) { @@ -4308,32 +4303,37 @@ initiate_descriptor_downloads(const routerstatus_t *source, * 256-bit digests. */ digest_len = DIGEST256_LEN; enc_digest_len = BASE64_DIGEST256_LEN; - sep = '-'; + sep = "-"; b64_256 = 1; } - if (n <= 0) - return; if (lo < 0) lo = 0; if (hi > smartlist_len(digests)) hi = smartlist_len(digests); - r_len = 8 + (enc_digest_len+1)*n; - cp = resource = tor_malloc(r_len); - memcpy(cp, "d/", 2); - cp += 2; - for (i = lo; i < hi; ++i) { + if (hi-lo <= 0) + return; + + digest_len += 1; // for the NULL + smartlist_t *tmp = smartlist_new(); + + for (; lo < hi; ++lo) { + cp = tor_malloc(enc_digest_len); if (b64_256) { - digest256_to_base64(cp, smartlist_get(digests, i)); + digest256_to_base64(cp, smartlist_get(digests, lo)); } else { - base16_encode(cp, r_len-(cp-resource), - smartlist_get(digests,i), digest_len); + base16_encode(cp, enc_digest_len, smartlist_get(digests, lo), digest_len); } - cp += enc_digest_len; - *cp++ = sep; + smartlist_add(tmp, cp); } - memcpy(cp-1, ".z", 3); + + cp = smartlist_join_strings(tmp, sep, 0, NULL); + tor_asprintf(&resource, "d/%s.z", cp); + + SMARTLIST_FOREACH(tmp, char *, cp1, tor_free(cp1)); + smartlist_free(tmp); + tor_free(cp); if (source) { /* We know which authority we want. */ diff --git a/src/or/routerlist.h b/src/or/routerlist.h index cfa8683..1e8b7c9 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -211,6 +211,10 @@ STATIC int choose_array_element_by_weight(const u64_dbl_t *entries, int n_entries); STATIC void scale_array_elements_to_u64(u64_dbl_t *entries, int n_entries, uint64_t *total_out); +MOCK_DECL(STATIC void, initiate_descriptor_downloads, + (const routerstatus_t *source, int purpose, smartlist_t *digests, + int lo, int hi, int pds_flags)); + #endif #endif

1 0

[tor/master] Send more descriptor requests per attempt when using tunneled connections
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 5ed5ac185bf6f30438af1638f30e04418ed27aff Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Sep 23 12:22:28 2014 -0400 Send more descriptor requests per attempt when using tunneled connections --- src/or/directory.c | 3 +- src/or/routerlist.c | 152 ++++++++++++++++++++++++++------------------------- 2 files changed, 81 insertions(+), 74 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 6fc5c20..7f272ed 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1261,7 +1261,8 @@ directory_send_command(dir_connection_t *conn, return; } - if (strlen(proxystring) + strlen(url) >= 4096) { + /* warn in the non-tunneled case */ + if (direct && (strlen(proxystring) + strlen(url) >= 4096)) { log_warn(LD_BUG, "Squid does not like URLs longer than 4095 bytes, and this " "one is %d bytes long: %s%s", diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 96814ca..5bcfdb4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4354,8 +4354,16 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads, * 4058/41 (40 for the hash and 1 for the + that separates them) => 98 * So use 96 because it's a nice number. */ -#define MAX_DL_PER_REQUEST 96 -#define MAX_MICRODESC_DL_PER_REQUEST 92 +int +max_dl_per_request(const or_options_t *options, int purpose) +{ + int max = 96; + if (purpose == DIR_PURPOSE_FETCH_MICRODESC) { + max = options->TunnelDirConns ? 1000 : 92; + } + return max; +} + /** Don't split our requests so finely that we are requesting fewer than * this number per server. */ #define MIN_DL_PER_REQUEST 4 @@ -4377,92 +4385,89 @@ launch_descriptor_downloads(int purpose, smartlist_t *downloadable, const routerstatus_t *source, time_t now) { - int should_delay = 0, n_downloadable; const or_options_t *options = get_options(); const char *descname; + const int fetch_microdesc = (purpose == DIR_PURPOSE_FETCH_MICRODESC); - tor_assert(purpose == DIR_PURPOSE_FETCH_SERVERDESC || - purpose == DIR_PURPOSE_FETCH_MICRODESC); + tor_assert(fetch_microdesc || purpose == DIR_PURPOSE_FETCH_SERVERDESC); + descname = fetch_microdesc ? "microdesc" : "routerdesc"; - descname = (purpose == DIR_PURPOSE_FETCH_SERVERDESC) ? - "routerdesc" : "microdesc"; + int n_downloadable = smartlist_len(downloadable); + if (!n_downloadable) + return; - n_downloadable = smartlist_len(downloadable); if (!directory_fetches_dir_info_early(options)) { if (n_downloadable >= MAX_DL_TO_DELAY) { log_debug(LD_DIR, "There are enough downloadable %ss to launch requests.", descname); - should_delay = 0; } else { - should_delay = (last_descriptor_download_attempted + - options->TestingClientMaxIntervalWithoutRequest) > now; - if (!should_delay && n_downloadable) { - if (last_descriptor_download_attempted) { - log_info(LD_DIR, - "There are not many downloadable %ss, but we've " - "been waiting long enough (%d seconds). Downloading.", - descname, - (int)(now-last_descriptor_download_attempted)); - } else { - log_info(LD_DIR, - "There are not many downloadable %ss, but we haven't " - "tried downloading descriptors recently. Downloading.", - descname); - } + + /* should delay */ + if ((last_descriptor_download_attempted + + options->TestingClientMaxIntervalWithoutRequest) > now) + return; + + if (last_descriptor_download_attempted) { + log_info(LD_DIR, + "There are not many downloadable %ss, but we've " + "been waiting long enough (%d seconds). Downloading.", + descname, + (int)(now-last_descriptor_download_attempted)); + } else { + log_info(LD_DIR, + "There are not many downloadable %ss, but we haven't " + "tried downloading descriptors recently. Downloading.", + descname); } + } } - if (! should_delay && n_downloadable) { - int i, n_per_request; - const char *req_plural = "", *rtr_plural = ""; - int pds_flags = PDS_RETRY_IF_NO_SERVERS; - if (! authdir_mode_any_nonhidserv(options)) { - /* If we wind up going to the authorities, we want to only open one - * connection to each authority at a time, so that we don't overload - * them. We do this by setting PDS_NO_EXISTING_SERVERDESC_FETCH - * regardless of whether we're a cache or not; it gets ignored if we're - * not calling router_pick_trusteddirserver. - * - * Setting this flag can make initiate_descriptor_downloads() ignore - * requests. We need to make sure that we do in fact call - * update_router_descriptor_downloads() later on, once the connections - * have succeeded or failed. - */ - pds_flags |= (purpose == DIR_PURPOSE_FETCH_MICRODESC) ? - PDS_NO_EXISTING_MICRODESC_FETCH : - PDS_NO_EXISTING_SERVERDESC_FETCH; - } + int i, n_per_request, max_dl_per_req; + const char *req_plural = "", *rtr_plural = ""; + int pds_flags = PDS_RETRY_IF_NO_SERVERS; + if (!authdir_mode_any_nonhidserv(options) || fetch_microdesc) { + /* If we wind up going to the authorities, we want to only open one + * connection to each authority at a time, so that we don't overload + * them. We do this by setting PDS_NO_EXISTING_SERVERDESC_FETCH + * regardless of whether we're a cache or not. + * + * Setting this flag can make initiate_descriptor_downloads() ignore + * requests. We need to make sure that we do in fact call + * update_router_descriptor_downloads() later on, once the connections + * have succeeded or failed. + */ + pds_flags |= fetch_microdesc ? + PDS_NO_EXISTING_MICRODESC_FETCH : + PDS_NO_EXISTING_SERVERDESC_FETCH; + } - n_per_request = CEIL_DIV(n_downloadable, MIN_REQUESTS); - if (purpose == DIR_PURPOSE_FETCH_MICRODESC) { - if (n_per_request > MAX_MICRODESC_DL_PER_REQUEST) - n_per_request = MAX_MICRODESC_DL_PER_REQUEST; - } else { - if (n_per_request > MAX_DL_PER_REQUEST) - n_per_request = MAX_DL_PER_REQUEST; - } - if (n_per_request < MIN_DL_PER_REQUEST) - n_per_request = MIN_DL_PER_REQUEST; - - if (n_downloadable > n_per_request) - req_plural = rtr_plural = "s"; - else if (n_downloadable > 1) - rtr_plural = "s"; - - log_info(LD_DIR, - "Launching %d request%s for %d %s%s, %d at a time", - CEIL_DIV(n_downloadable, n_per_request), req_plural, - n_downloadable, descname, rtr_plural, n_per_request); - smartlist_sort_digests(downloadable); - for (i=0; i < n_downloadable; i += n_per_request) { - initiate_descriptor_downloads(source, purpose, - downloadable, i, i+n_per_request, - pds_flags); - } - last_descriptor_download_attempted = now; + n_per_request = CEIL_DIV(n_downloadable, MIN_REQUESTS); + max_dl_per_req = max_dl_per_request(options, purpose); + + if (n_per_request > max_dl_per_req) + n_per_request = max_dl_per_req; + + if (n_per_request < MIN_DL_PER_REQUEST) + n_per_request = MIN_DL_PER_REQUEST; + + if (n_downloadable > n_per_request) + req_plural = rtr_plural = "s"; + else if (n_downloadable > 1) + rtr_plural = "s"; + + log_info(LD_DIR, + "Launching %d request%s for %d %s%s, %d at a time", + CEIL_DIV(n_downloadable, n_per_request), req_plural, + n_downloadable, descname, rtr_plural, n_per_request); + smartlist_sort_digests(downloadable); + for (i=0; i < n_downloadable; i += n_per_request) { + initiate_descriptor_downloads(source, purpose, + downloadable, i, i+n_per_request, + pds_flags); } + last_descriptor_download_attempted = now; } /** For any descriptor that we want that's currently listed in @@ -4698,9 +4703,10 @@ update_extrainfo_downloads(time_t now) n_no_ei, n_have, n_delay, n_pending, smartlist_len(wanted)); smartlist_shuffle(wanted); - for (i = 0; i < smartlist_len(wanted); i += MAX_DL_PER_REQUEST) { + int max_dl_per_req = max_dl_per_request(options, DIR_PURPOSE_FETCH_EXTRAINFO); + for (i = 0; i < smartlist_len(wanted); i += max_dl_per_req) { initiate_descriptor_downloads(NULL, DIR_PURPOSE_FETCH_EXTRAINFO, - wanted, i, i + MAX_DL_PER_REQUEST, + wanted, i, i+max_dl_per_req, PDS_RETRY_IF_NO_SERVERS|PDS_NO_EXISTING_SERVERDESC_FETCH); }

1 0

[tor/master] fixup! Download microdescriptors if you're a cache
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 06bda506003826bf9a28aec3afe0b7b1ae6cc9c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 23 12:32:02 2014 -0400 fixup! Download microdescriptors if you're a cache --- src/or/routerlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5bcfdb4..ff2f54d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4295,8 +4295,9 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads, { char *resource, *cp; int digest_len = DIGEST_LEN, enc_digest_len = HEX_DIGEST_LEN; - char *sep = "+"; + const char *sep = "+"; int b64_256 = 0; + smartlist_t *tmp; if (purpose == DIR_PURPOSE_FETCH_MICRODESC) { /* Microdescriptors are downloaded by "-"-separated base64-encoded @@ -4316,7 +4317,7 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads, return; digest_len += 1; // for the NULL - smartlist_t *tmp = smartlist_new(); + tmp = smartlist_new(); for (; lo < hi; ++lo) { cp = tor_malloc(enc_digest_len);

1 0

[tor/master] fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_*
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit cae0e7b06bcb75494f75cb29fc0f9a356c284bf4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 23 12:30:47 2014 -0400 fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_* Clean up comments on PDS_NO_EXISTING_* --- src/or/or.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 546adaa..b778435 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4925,14 +4925,13 @@ typedef struct dir_server_t { * or extrainfo documents. * * Passed to router_pick_directory_server (et al) - * - * [XXXX NOTE: This option is only implemented for pick_trusteddirserver, - * not pick_directory_server. If we make it work on pick_directory_server - * too, we could conservatively make it only prevent multiple fetches to - * the same authority, or we could aggressively make it prevent multiple - * fetches to _any_ single directory server.] */ #define PDS_NO_EXISTING_SERVERDESC_FETCH (1<<3) +/** Flag to indicate that we should not use any directory authority to which + * we have an existing directory connection for downloading microdescs. + * + * Passed to router_pick_directory_server (et al) + */ #define PDS_NO_EXISTING_MICRODESC_FETCH (1<<4) /** This node is to be chosen as a directory guard, so don't choose any

1 0

[tor/master] fixup! Unit tests for router download functions.
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 482e3cfa0969775233d3f903639c44f32ddaf820 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 23 12:38:43 2014 -0400 fixup! Unit tests for router download functions. Fix compilation warnings --- src/test/test_dir.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index f6ea6f3..c7f2480 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2372,12 +2372,12 @@ static void test_dir_fetch_type(void *arg) { (void)arg; - test_eq(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL, - NULL), MICRODESC_DIRINFO); - test_eq(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, - NULL), BRIDGE_DIRINFO); - test_eq(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, - "microdesc"), V3_DIRINFO | MICRODESC_DIRINFO); + tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL, + NULL) == MICRODESC_DIRINFO); + tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, + NULL) == BRIDGE_DIRINFO); + tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, + "microdesc") == (V3_DIRINFO | MICRODESC_DIRINFO)); done: ; }

1 0

[tor/master] fixup! Send more descriptor requests per attempt when using tunneled connections
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 02464694b2fa901e04b8a8f1c467a0773e6d4c27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 23 12:34:17 2014 -0400 fixup! Send more descriptor requests per attempt when using tunneled connections Compilation fixes --- src/or/routerlist.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index ff2f54d..e0cb517 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4355,7 +4355,7 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads, * 4058/41 (40 for the hash and 1 for the + that separates them) => 98 * So use 96 because it's a nice number. */ -int +static int max_dl_per_request(const or_options_t *options, int purpose) { int max = 96; @@ -4389,11 +4389,15 @@ launch_descriptor_downloads(int purpose, const or_options_t *options = get_options(); const char *descname; const int fetch_microdesc = (purpose == DIR_PURPOSE_FETCH_MICRODESC); + int n_downloadable = smartlist_len(downloadable); + + int i, n_per_request, max_dl_per_req; + const char *req_plural = "", *rtr_plural = ""; + int pds_flags = PDS_RETRY_IF_NO_SERVERS; tor_assert(fetch_microdesc || purpose == DIR_PURPOSE_FETCH_SERVERDESC); descname = fetch_microdesc ? "microdesc" : "routerdesc"; - int n_downloadable = smartlist_len(downloadable); if (!n_downloadable) return; @@ -4425,9 +4429,6 @@ launch_descriptor_downloads(int purpose, } } - int i, n_per_request, max_dl_per_req; - const char *req_plural = "", *rtr_plural = ""; - int pds_flags = PDS_RETRY_IF_NO_SERVERS; if (!authdir_mode_any_nonhidserv(options) || fetch_microdesc) { /* If we wind up going to the authorities, we want to only open one * connection to each authority at a time, so that we don't overload @@ -4648,7 +4649,7 @@ update_extrainfo_downloads(time_t now) routerlist_t *rl; smartlist_t *wanted; digestmap_t *pending; - int old_routers, i; + int old_routers, i, max_dl_per_req; int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0; if (! options->DownloadExtraInfo) return; @@ -4704,7 +4705,8 @@ update_extrainfo_downloads(time_t now) n_no_ei, n_have, n_delay, n_pending, smartlist_len(wanted)); smartlist_shuffle(wanted); - int max_dl_per_req = max_dl_per_request(options, DIR_PURPOSE_FETCH_EXTRAINFO); + + max_dl_per_req = max_dl_per_request(options, DIR_PURPOSE_FETCH_EXTRAINFO); for (i = 0; i < smartlist_len(wanted); i += max_dl_per_req) { initiate_descriptor_downloads(NULL, DIR_PURPOSE_FETCH_EXTRAINFO, wanted, i, i+max_dl_per_req,

1 0

[tor/master] fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_*
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 55b21b366c4a8c237dda0a967c0c499e18fb0b4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 23 12:47:39 2014 -0400 fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_* Document n_busy_out, and set it correctly when we goto retry_without_exclude. --- src/or/routerlist.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index e0cb517..e658986 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1383,6 +1383,10 @@ router_pick_dirserver_generic(smartlist_t *sourcelist, * * If the PDS_PREFER_TUNNELED_DIR_CONNS_ flag is set, prefer directory servers * that we can use with BEGINDIR. + * + * If n_busy_out is provided, set *n_busy_out to the number of + * directories that we excluded for no other reason than + * PDS_NO_EXISTING_SERVERDESC_FETCH or PDS_NO_EXISTING_MICRODESC_FETCH. */ static const routerstatus_t * router_pick_directory_server_impl(dirinfo_type_t type, int flags, @@ -1506,17 +1510,18 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, smartlist_free(overloaded_direct); smartlist_free(overloaded_tunnel); - if (n_busy_out) - *n_busy_out = n_busy; - if (result == NULL && try_excluding && !options->StrictNodes && n_excluded) { /* If we got no result, and we are excluding nodes, and StrictNodes is * not set, try again without excluding nodes. */ try_excluding = 0; n_excluded = 0; + n_busy = 0; goto retry_without_exclude; } + if (n_busy_out) + *n_busy_out = n_busy; + return result ? result->rs : NULL; }

1 0

[tor/master] Unit tests for router download functions.
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit bb137e23c1c30f7e9f469d4924bbce2bb9b2d2ed Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Sep 23 12:22:36 2014 -0400 Unit tests for router download functions. Also, sort test suites alphabetically. --- src/test/include.am | 7 ++++--- src/test/test.c | 32 +++++++++++++++++--------------- src/test/test_dir.c | 26 ++++++++++++++++++++++++++ src/test/test_nodelist.c | 2 +- 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index c6743a1..74ac526 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -22,6 +22,7 @@ src_test_test_SOURCES = \ src/test/test_cell_formats.c \ src/test/test_circuitlist.c \ src/test/test_circuitmux.c \ + src/test/test_config.c \ src/test/test_containers.c \ src/test/test_controller_events.c \ src/test/test_crypto.c \ @@ -29,19 +30,19 @@ src_test_test_SOURCES = \ src/test/test_data.c \ src/test/test_dir.c \ src/test/test_extorport.c \ + src/test/test_hs.c \ src/test/test_introduce.c \ src/test/test_logging.c \ src/test/test_microdesc.c \ + src/test/test_nodelist.c \ src/test/test_oom.c \ src/test/test_options.c \ src/test/test_pt.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ + src/test/test_routerlist.c \ src/test/test_socks.c \ src/test/test_util.c \ - src/test/test_config.c \ - src/test/test_hs.c \ - src/test/test_nodelist.c \ src/ext/tinytest.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) diff --git a/src/test/test.c b/src/test/test.c index 0ba5da3..8b53754 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1637,33 +1637,35 @@ extern struct testcase_t hs_tests[]; extern struct testcase_t nodelist_tests[]; extern struct testcase_t routerkeys_tests[]; extern struct testcase_t oom_tests[]; +extern struct testcase_t routerlist_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, - { "buffer/", buffer_tests }, - { "socks/", socks_tests }, { "addr/", addr_tests }, - { "crypto/", crypto_tests }, - { "container/", container_tests }, - { "util/", util_tests }, - { "util/logging/", logging_tests }, + { "buffer/", buffer_tests }, { "cellfmt/", cell_format_tests }, { "cellqueue/", cell_queue_tests }, - { "dir/", dir_tests }, - { "dir/md/", microdesc_tests }, - { "pt/", pt_tests }, - { "config/", config_tests }, - { "replaycache/", replaycache_tests }, - { "introduce/", introduce_tests }, { "circuitlist/", circuitlist_tests }, { "circuitmux/", circuitmux_tests }, - { "options/", options_tests }, - { "extorport/", extorport_tests }, + { "config/", config_tests }, + { "container/", container_tests }, { "control/", controller_event_tests }, + { "crypto/", crypto_tests }, + { "dir/", dir_tests }, + { "dir/md/", microdesc_tests }, + { "extorport/", extorport_tests }, { "hs/", hs_tests }, + { "introduce/", introduce_tests }, { "nodelist/", nodelist_tests }, - { "routerkeys/", routerkeys_tests }, { "oom/", oom_tests }, + { "options/", options_tests }, + { "pt/", pt_tests }, + { "routerkeys/", routerkeys_tests }, + { "routerlist/", routerlist_tests }, + { "replaycache/", replaycache_tests }, + { "socks/", socks_tests }, + { "util/", util_tests }, + { "util/logging/", logging_tests }, END_OF_GROUPS }; diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 9e01bdb..f6ea6f3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2357,6 +2357,30 @@ test_dir_http_handling(void *args) tor_free(url); } +static void +test_dir_purpose_needs_anonymity(void *arg) +{ + (void)arg; + tt_int_op(1, ==, purpose_needs_anonymity(0, ROUTER_PURPOSE_BRIDGE)); + tt_int_op(1, ==, purpose_needs_anonymity(0, ROUTER_PURPOSE_GENERAL)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_MICRODESC, + ROUTER_PURPOSE_GENERAL)); + done: ; +} + +static void +test_dir_fetch_type(void *arg) +{ + (void)arg; + test_eq(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL, + NULL), MICRODESC_DIRINFO); + test_eq(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, + NULL), BRIDGE_DIRINFO); + test_eq(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, + "microdesc"), V3_DIRINFO | MICRODESC_DIRINFO); + done: ; +} + #define DIR_LEGACY(name) \ { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_dir_ ## name } @@ -2379,6 +2403,8 @@ struct testcase_t dir_tests[] = { DIR_LEGACY(clip_unmeasured_bw_kb_alt), DIR(fmt_control_ns, 0), DIR(http_handling, 0), + DIR(purpose_needs_anonymity, 0), + DIR(fetch_type, 0), END_OF_TESTCASES }; diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index 600e6a8..67d39f3 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -10,7 +10,7 @@ #include "nodelist.h" #include "test.h" -/** Tese the case when node_get_by_id() returns NULL, +/** Test the case when node_get_by_id() returns NULL, * node_get_verbose_nickname_by_id should return the base 16 encoding * of the id. */

1 0

[tor/master] changes file for 9969
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 0b121433464804889240a6884179fa4631f0d7b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 23 10:02:49 2015 -0500 changes file for 9969 --- changes/ticket9969 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/ticket9969 b/changes/ticket9969 new file mode 100644 index 0000000..c208e26 --- /dev/null +++ b/changes/ticket9969 @@ -0,0 +1,8 @@ + o Minor features (directory client): + - When downloading server- or microdescriptors from a directory server, + we no longer launch multiple simultaneous requests to the same server. + This reduces load on the directory servers, especially when directory + guards are in use. Closes ticket 9969. + - When downloading server- or microdescriptors over a tunneled + connection, do not limit the length of our request to what the Squid + proxy is willing to handle. Part of ticket 9969.

1 0

[tor/master] fixup! Refactor initiate_descriptor_downloads() to be safer
by nickm＠torproject.org 23 Jan '15

23 Jan '15

commit 0fdfdae7e3a88a9172a51f36ac6b536b5687d401 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 23 12:56:16 2014 -0400 fixup! Refactor initiate_descriptor_downloads() to be safer Calculate digest_len correctly. Also, refactor setting of initial variables to look a little nicer. --- src/or/routerlist.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index e658986..efa4abb 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4299,18 +4299,23 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads, int lo, int hi, int pds_flags)) { char *resource, *cp; - int digest_len = DIGEST_LEN, enc_digest_len = HEX_DIGEST_LEN; - const char *sep = "+"; - int b64_256 = 0; + int digest_len, enc_digest_len; + const char *sep; + int b64_256; smartlist_t *tmp; if (purpose == DIR_PURPOSE_FETCH_MICRODESC) { /* Microdescriptors are downloaded by "-"-separated base64-encoded * 256-bit digests. */ digest_len = DIGEST256_LEN; - enc_digest_len = BASE64_DIGEST256_LEN; + enc_digest_len = BASE64_DIGEST256_LEN + 1; sep = "-"; b64_256 = 1; + } else { + digest_len = DIGEST_LEN; + enc_digest_len = HEX_DIGEST_LEN + 1; + sep = "+"; + b64_256 = 0; } if (lo < 0) @@ -4321,7 +4326,6 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads, if (hi-lo <= 0) return; - digest_len += 1; // for the NULL tmp = smartlist_new(); for (; lo < hi; ++lo) {

1 0