tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[tor/master] Fix indentation on a block
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit cc10f13408e25eaf04f849d0f761680f383fa61d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 11:05:09 2015 -0400 Fix indentation on a block --- src/or/control.c | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index fde3990..d4216d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2101,45 +2101,45 @@ getinfo_helper_events(control_connection_t *control_conn, } *answer = bridge_stats; } else if (!strcmp(question, "status/fresh-relay-descs")) { - if (!server_mode(get_options())) { - *errmsg = "Only relays have descriptors"; - return -1; - } - routerinfo_t *r; - extrainfo_t *e; - if (router_build_fresh_descriptor(&r, &e) < 0) { - *errmsg = "Error generating descriptor"; - return -1; - } - size_t size = r->cache_info.signed_descriptor_len + 1; - if (e) { - size += e->cache_info.signed_descriptor_len + 1; - } - tor_assert(r->cache_info.signed_descriptor_len); - char *descs = tor_malloc(size); - char *cp = descs; - memcpy(cp, signed_descriptor_get_body(&r->cache_info), - r->cache_info.signed_descriptor_len); - cp += r->cache_info.signed_descriptor_len - 1; - if (e) { - if (cp[0] == '\0') { - cp[0] = '\n'; - } else if (cp[0] != '\n') { - cp[1] = '\n'; - cp++; - } - memcpy(cp, signed_descriptor_get_body(&e->cache_info), - e->cache_info.signed_descriptor_len); - cp += e->cache_info.signed_descriptor_len - 1; - } - if (cp[0] == '\n') { - cp[0] = '\0'; - } else if (cp[0] != '\0') { - cp[1] = '\0'; + if (!server_mode(get_options())) { + *errmsg = "Only relays have descriptors"; + return -1; + } + routerinfo_t *r; + extrainfo_t *e; + if (router_build_fresh_descriptor(&r, &e) < 0) { + *errmsg = "Error generating descriptor"; + return -1; + } + size_t size = r->cache_info.signed_descriptor_len + 1; + if (e) { + size += e->cache_info.signed_descriptor_len + 1; + } + tor_assert(r->cache_info.signed_descriptor_len); + char *descs = tor_malloc(size); + char *cp = descs; + memcpy(cp, signed_descriptor_get_body(&r->cache_info), + r->cache_info.signed_descriptor_len); + cp += r->cache_info.signed_descriptor_len - 1; + if (e) { + if (cp[0] == '\0') { + cp[0] = '\n'; + } else if (cp[0] != '\n') { + cp[1] = '\n'; + cp++; } - *answer = descs; - routerinfo_free(r); - extrainfo_free(e); + memcpy(cp, signed_descriptor_get_body(&e->cache_info), + e->cache_info.signed_descriptor_len); + cp += e->cache_info.signed_descriptor_len - 1; + } + if (cp[0] == '\n') { + cp[0] = '\0'; + } else if (cp[0] != '\0') { + cp[1] = '\0'; + } + *answer = descs; + routerinfo_free(r); + extrainfo_free(e); } else { return 0; }

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug14784'
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit b98cc79477e5eb70284bb70dc80d778d5d082cc1 Merge: c3e8b7f 0c11d8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 11:10:37 2015 -0400 Merge remote-tracking branch 'sebastian/bug14784' changes/bug14784 | 4 ++++ src/or/control.c | 43 +++++++++++++++++++++++++++++++++++++++ src/or/router.c | 59 ++++++++++++++++++++++++++++++++++++++++-------------- src/or/router.h | 1 + 4 files changed, 92 insertions(+), 15 deletions(-)

1 0

[tor/master] Remove spurious warn
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit 1a7dea9191585853fe9b3e591a98620c994111cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 11:04:17 2015 -0400 Remove spurious warn --- src/or/control.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index a34eb0d..fde3990 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2137,7 +2137,6 @@ getinfo_helper_events(control_connection_t *control_conn, } else if (cp[0] != '\0') { cp[1] = '\0'; } - log_warn(LD_CONFIG, "%s", descs); *answer = descs; routerinfo_free(r); extrainfo_free(e);

1 0

[tor/master] Implement status/fresh-relay-descs command
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit 0c11d8b2d218b48ede19601bb7400639e3883a9c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 15 12:33:33 2015 +0100 Implement status/fresh-relay-descs command The idea here is that a controller should be able to make Tor produce a new relay descriptor on demand, without that descriptor actually being uploaded to the dirauths (they would likely reject it anyway due to freshness concerns). Implements #14784. --- changes/bug14784 | 4 ++++ src/or/control.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/changes/bug14784 b/changes/bug14784 new file mode 100644 index 0000000..1f50142 --- /dev/null +++ b/changes/bug14784 @@ -0,0 +1,4 @@ + o Minor features: + - Implement a new controller command "status/fresh-relay-descs" to + fetch a descriptor/extrainfo pair that was generated on demand + just for the controller's use. Implements ticket 14784. diff --git a/src/or/control.c b/src/or/control.c index 064b745..2977b8b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2100,6 +2100,47 @@ getinfo_helper_events(control_connection_t *control_conn, return -1; } *answer = bridge_stats; + } else if (!strcmp(question, "status/fresh-relay-descs")) { + if (!server_mode(get_options())) { + *errmsg = "Only relays have descriptors"; + return -1; + } + routerinfo_t *r; + extrainfo_t *e; + if (router_build_fresh_descriptor(&r, &e) < 0) { + *errmsg = "Error generating descriptor"; + return -1; + } + size_t size = r->cache_info.signed_descriptor_len + 1; + if (e) { + size += e->cache_info.signed_descriptor_len + 1; + } + tor_assert(r->cache_info.signed_descriptor_len); + char *descs = tor_malloc(size); + char *cp = descs; + memcpy(cp, signed_descriptor_get_body(&r->cache_info), + r->cache_info.signed_descriptor_len); + cp += r->cache_info.signed_descriptor_len - 1; + if (e) { + if (cp[0] == '\0') { + cp[0] = '\n'; + } else if (cp[0] != '\n') { + cp[1] = '\n'; + cp++; + } + memcpy(cp, signed_descriptor_get_body(&e->cache_info), + e->cache_info.signed_descriptor_len); + cp += e->cache_info.signed_descriptor_len - 1; + } + if (cp[0] == '\n') { + cp[0] = '\0'; + } else if (cp[0] != '\0') { + cp[1] = '\0'; + } + log_warn(LD_CONFIG, "%s", descs); + *answer = descs; + routerinfo_free(r); + extrainfo_free(e); } else { return 0; } @@ -2210,6 +2251,8 @@ static const getinfo_item_t getinfo_items[] = { "The last bootstrap phase status event that Tor sent."), DOC("status/clients-seen", "Breakdown of client countries seen by a bridge."), + DOC("status/fresh-relay-descs", + "A fresh relay/ei descriptor pair for Tor's current state. Not stored."), DOC("status/version/recommended", "List of currently recommended versions."), DOC("status/version/current", "Status of the current version."), DOC("status/version/num-versioning", "Number of versioning authorities."),

1 0

[tor/master] Refactor router_rebuild_descriptor
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit 8feaf3846d67d80d6a1bae9867cdf55bafdc437e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Feb 7 13:29:26 2015 +0100 Refactor router_rebuild_descriptor Allow building a router descriptor without storing it to global state. This is in preparation of a patch to export the created descriptors via the control port. --- src/or/router.c | 59 +++++++++++++++++++++++++++++++++++++++++-------------- src/or/router.h | 1 + 2 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 2ddaa89..b8bfd3c 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1802,12 +1802,15 @@ router_pick_published_address(const or_options_t *options, uint32_t *addr) return 0; } -/** If <b>force</b> is true, or our descriptor is out-of-date, rebuild a fresh - * routerinfo, signed server descriptor, and extra-info document for this OR. - * Return 0 on success, -1 on temporary error. +/** Build a fresh routerinfo, signed server descriptor, and extra-info document + * for this OR. Set r to the generated routerinfo, e to the generated + * extra-info document. Return 0 on success, -1 on temporary error. Failure to + * generate an extra-info document is not an error and is indicated by setting + * e to NULL. Caller is responsible for freeing generated documents if 0 is + * returned. */ int -router_rebuild_descriptor(int force) +router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) { routerinfo_t *ri; extrainfo_t *ei; @@ -1816,20 +1819,11 @@ router_rebuild_descriptor(int force) int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); - if (desc_clean_since && !force) - return 0; - - if (router_pick_published_address(options, &addr) < 0 || - router_get_advertised_or_port(options) == 0) { - /* Stop trying to rebuild our descriptor every second. We'll - * learn that it's time to try again when ip_address_changed() - * marks it dirty. */ - desc_clean_since = time(NULL); + if (router_pick_published_address(options, &addr) < 0) { + log_warn(LD_CONFIG, "Don't know my address while generating descriptor"); return -1; } - log_info(LD_OR, "Rebuilding relay descriptor%s", force ? " (forced)" : ""); - ri = tor_malloc_zero(sizeof(routerinfo_t)); ri->cache_info.routerlist_index = -1; ri->nickname = tor_strdup(options->Nickname); @@ -2024,6 +2018,41 @@ router_rebuild_descriptor(int force) tor_assert(! routerinfo_incompatible_with_extrainfo(ri, ei, NULL, NULL)); } + *r = ri; + *e = ei; + return 0; +} + +/** If <b>force</b> is true, or our descriptor is out-of-date, rebuild a fresh + * routerinfo, signed server descriptor, and extra-info document for this OR. + * Return 0 on success, -1 on temporary error. + */ +int +router_rebuild_descriptor(int force) +{ + routerinfo_t *ri; + extrainfo_t *ei; + uint32_t addr; + const or_options_t *options = get_options(); + + if (desc_clean_since && !force) + return 0; + + if (router_pick_published_address(options, &addr) < 0 || + router_get_advertised_or_port(options) == 0) { + /* Stop trying to rebuild our descriptor every second. We'll + * learn that it's time to try again when ip_address_changed() + * marks it dirty. */ + desc_clean_since = time(NULL); + return -1; + } + + log_info(LD_OR, "Rebuilding relay descriptor%s", force ? " (forced)" : ""); + + if (router_build_fresh_descriptor(&ri, &ei) < 0) { + return -1; + } + routerinfo_free(desc_routerinfo); desc_routerinfo = ri; extrainfo_free(desc_extrainfo); diff --git a/src/or/router.h b/src/or/router.h index 8108ffb..73b43bc 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -89,6 +89,7 @@ const uint8_t *router_get_my_id_digest(void); int router_extrainfo_digest_is_me(const char *digest); int router_is_me(const routerinfo_t *router); int router_pick_published_address(const or_options_t *options, uint32_t *addr); +int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e); int router_rebuild_descriptor(int force); char *router_dump_router_to_string(routerinfo_t *router, crypto_pk_t *ident_key);

1 0

[torspec/master] Remove note about wildcard transport; see #15612
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit a95724915096956ceff80856a4176f081660ca9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 10:53:31 2015 -0400 Remove note about wildcard transport; see #15612 --- pt-spec.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/pt-spec.txt b/pt-spec.txt index aea7fd5..43ae73f 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -103,7 +103,6 @@ connection | +-----------+ ^ +------------+ | whichever one is listed first. TODO: Document external mode - TODO: Document '*' transport 2.1.0.1. Bridge torrc lines

1 0

[tor/master] Fix another space issue
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit c3e8b7f2da7f5c7fc4d341b533b7031eab90a665 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 10:38:12 2015 -0400 Fix another space issue --- src/or/rendcommon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 775d2b9..3fea07f 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -963,7 +963,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) *e = entry; } -end: + end: return ret; }

1 0

[tor/master] Merge remote-tracking branch 'teor/fix-spaces-20150415'
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit eec58c35482d4425fccf38d632035319b56f795e Merge: 7e1fa9d af2b6bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 10:37:55 2015 -0400 Merge remote-tracking branch 'teor/fix-spaces-20150415' src/common/crypto.h | 1 + src/test/test-memwipe.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix spaces in crypto.h and test-memwipe.c
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit af2b6bdaba85d617f9eb93c67457f8b89b088b2d Author: teor <teor2345(a)gmail.com> Date: Wed Apr 15 19:42:41 2015 +1000 Fix spaces in crypto.h and test-memwipe.c --- src/common/crypto.h | 1 + src/test/test-memwipe.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/crypto.h b/src/common/crypto.h index 440ff23..b9c26a4 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -296,3 +296,4 @@ struct dh_st *crypto_dh_get_dh_(crypto_dh_t *dh); void crypto_add_spaces_to_fp(char *out, size_t outlen, const char *in); #endif + diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index a721a8e..815475a 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -148,8 +148,11 @@ check_heap_buffer(void) static struct testcase { const char *name; - unsigned (*fill_fn)(void); - unsigned (*check_fn)(void); + /* this spacing satisfies make check-spaces */ + unsigned + (*fill_fn)(void); + unsigned + (*check_fn)(void); } testcases[] = { { "nil", fill_a_buffer_nothing, check_a_buffer }, { "nil-heap", fill_heap_buffer_nothing, check_heap_buffer },

1 0

[tor/master] changes file for 14391
by nickm＠torproject.org 15 Apr '15

15 Apr '15

commit 7e1fa9d63e7ef6d41b78280a73f86a0b17110dfd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 15 10:34:19 2015 -0400 changes file for 14391 --- changes/bug14391 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug14391 b/changes/bug14391 new file mode 100644 index 0000000..5907372 --- /dev/null +++ b/changes/bug14391 @@ -0,0 +1,5 @@ + + o Code simplification and refactoring: + - Refactor hidden service client-side cache lookup to intelligently + report its various failure cases, and disentangle failure cases + involving a lack of introduction points. Closes ticket 14391.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015