- tor-commits - lists.torproject.org

r25645: {website} the cutoff for the Fast flag is 30KB (website/trunk/docs/en)
by Roger Dingledine 10 May '12

10 May '12

Author: arma Date: 2012-05-10 23:35:20 +0000 (Thu, 10 May 2012) New Revision: 25645 Modified: website/trunk/docs/en/tor-doc-relay.wml Log: the cutoff for the Fast flag is 30KB Modified: website/trunk/docs/en/tor-doc-relay.wml =================================================================== --- website/trunk/docs/en/tor-doc-relay.wml 2012-05-10 03:34:17 UTC (rev 25644) +++ website/trunk/docs/en/tor-doc-relay.wml 2012-05-10 23:35:20 UTC (rev 25645) @@ -18,7 +18,7 @@ The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 20 kilobytes/s each way, please help out Tor by configuring your + at least 30 kilobytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including <a href="<page docs/faq>#ExitPolicies">rate limiting for bandwidth, exit policies so you can limit your exposure to abuse

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 10 May '12

10 May '12

commit 648db9a4b7101d54f38aee60f42546e9a172e17e Merge: 02a6507 436654e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 17:57:31 2012 -0400 Merge branch 'maint-0.2.2' src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[tor/master] fix over-wide line from f661747370
by arma＠torproject.org 10 May '12

10 May '12

commit 436654ee9670aed5f21f571f3eae743c109a2eba Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 17:46:19 2012 -0400 fix over-wide line from f661747370 --- src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 5ffe63b..c1a19ca 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2845,7 +2845,8 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", + conn); connection_mark_for_close(TO_CONN(conn)); return -1; }

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 10 May '12

10 May '12

commit 0daad3e44d609b451173d1fdbbb39f28f2d1d461 Merge: d06ea86 436654e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 17:57:16 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] fix over-wide line from f661747370
by arma＠torproject.org 10 May '12

10 May '12

commit 436654ee9670aed5f21f571f3eae743c109a2eba Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 17:46:19 2012 -0400 fix over-wide line from f661747370 --- src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 5ffe63b..c1a19ca 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2845,7 +2845,8 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", + conn); connection_mark_for_close(TO_CONN(conn)); return -1; }

1 0

[tor/maint-0.2.2] fix over-wide line from f661747370
by arma＠torproject.org 10 May '12

10 May '12

commit 436654ee9670aed5f21f571f3eae743c109a2eba Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 17:46:19 2012 -0400 fix over-wide line from f661747370 --- src/or/control.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 5ffe63b..c1a19ca 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2845,7 +2845,8 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", + conn); connection_mark_for_close(TO_CONN(conn)); return -1; }

1 0

[tor/master] Fix O(n^2) performance when parsing a big pile of extrainfos
by arma＠torproject.org 10 May '12

10 May '12

commit 02a650786b21e4f3c255d686a3b5df875b2d66b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 17:27:16 2012 -0400 Fix O(n^2) performance when parsing a big pile of extrainfos We were doing an O(n) strlen in router_get_extrainfo_hash() for every one we tried to parse. Instead, have router_get_extrainfo_hash() take the length of the extrainfo as an argument, so that when it's called from extrainfo_parse_from_string(), it doesn't do a strlen() over the whole pile of extrainfos. --- changes/bug5828 | 3 +++ src/or/router.c | 3 ++- src/or/routerparse.c | 10 +++++----- src/or/routerparse.h | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug5828 b/changes/bug5828 new file mode 100644 index 0000000..3a1734d --- /dev/null +++ b/changes/bug5828 @@ -0,0 +1,3 @@ + o Minor bugfixes (performance): + - Avoid O(n^2) performance characteristics when parsing a large + extrainfo cache. Fixes bug 5828; bugfix on 0.2.0.1-alpha. diff --git a/src/or/router.c b/src/or/router.c index c51bb5d..35955f3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1655,6 +1655,7 @@ router_rebuild_descriptor(int force) ei->cache_info.signed_descriptor_len = strlen(ei->cache_info.signed_descriptor_body); router_get_extrainfo_hash(ei->cache_info.signed_descriptor_body, + ei->cache_info.signed_descriptor_len, ei->cache_info.signed_descriptor_digest); } @@ -2359,7 +2360,7 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, } memset(sig, 0, sizeof(sig)); - if (router_get_extrainfo_hash(s, digest) < 0 || + if (router_get_extrainfo_hash(s, strlen(s), digest) < 0 || router_append_dirobj_signature(sig, sizeof(sig), digest, DIGEST_LEN, ident_key) < 0) { log_warn(LD_BUG, "Could not append signature to extra-info " diff --git a/src/or/routerparse.c b/src/or/routerparse.c index c5ce174..781c578 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -682,12 +682,12 @@ router_get_networkstatus_v3_hash(const char *s, char *digest, ' ', alg); } -/** Set digest to the SHA-1 digest of the hash of the extrainfo - * string in s. Return 0 on success, -1 on failure. */ +/** Set digest to the SHA-1 digest of the hash of the s_len-byte + * extrainfo string at s. Return 0 on success, -1 on failure. */ int -router_get_extrainfo_hash(const char *s, char *digest) +router_get_extrainfo_hash(const char *s, size_t s_len, char *digest) { - return router_get_hash_impl(s, strlen(s), digest, "extra-info", + return router_get_hash_impl(s, s_len, digest, "extra-info", "\nrouter-signature",'\n', DIGEST_SHA1); } @@ -1643,7 +1643,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, while (end > s+2 && *(end-1) == '\n' && *(end-2) == '\n') --end; - if (router_get_extrainfo_hash(s, digest) < 0) { + if (router_get_extrainfo_hash(s, end-s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err; } diff --git a/src/or/routerparse.h b/src/or/routerparse.h index b274d21..6486a09 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -19,7 +19,7 @@ int router_get_networkstatus_v2_hash(const char *s, char *digest); int router_get_networkstatus_v3_hash(const char *s, char *digest, digest_algorithm_t algorithm); int router_get_networkstatus_v3_hashes(const char *s, digests_t *digests); -int router_get_extrainfo_hash(const char *s, char *digest); +int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest); #define DIROBJ_MAX_SIG_LEN 256 int router_append_dirobj_signature(char *buf, size_t buf_len, const char *digest,

1 0

[tor/release-0.2.2] fold in latest changes
by arma＠torproject.org 10 May '12

10 May '12

commit d06ea86850704084670ec864a685a5e857c3a6a6 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 16:10:56 2012 -0400 fold in latest changes --- ChangeLog | 7 +++++++ changes/bug5760 | 3 --- changes/bug5786_range | 8 -------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd3e90e..43ce239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,13 @@ Changes in version 0.2.2.36 - 2012-04-?? bugfix on 0.2.2.29-beta. Bug found by wanoskarnet. o Minor bugfixes: + - Make our number-parsing functions always treat too-large values + as an error, even when those values exceed the width of the + underlying type. Previously, if the caller provided these + functions with minima or maxima set to the extreme values of the + underlying integer type, these functions would return those + values on overflow rather than treating overflow as an error. + Fixes part of bug 5786; bugfix on 0.0.9. - Older Linux kernels erroneously respond to strange nmap behavior by having accept() return successfully with a zero-length socket. When this happens, just close the connection. Previously, diff --git a/changes/bug5760 b/changes/bug5760 deleted file mode 100644 index a26407b..0000000 --- a/changes/bug5760 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes: - - End AUTHCHALLENGE error response messages with a CRLF. Fixes bug 5760; - bugfix on 0.2.3.16-alpha, and backported to maint-0.2.2 diff --git a/changes/bug5786_range b/changes/bug5786_range deleted file mode 100644 index 40ac4d2..0000000 --- a/changes/bug5786_range +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes: - - Make our number-parsing functions always treat too-large values - as an error, even when those values exceed the width of the - underlying type. Previously, if the caller provided these - functions with minima or maxima set to the extreme values of the - underlying integer type, these functions would return those - values on overflow rather than treating overflow as an error. - Fix for part of bug 5786; bugfix on Tor 0.0.9. \ No newline at end of file

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 10 May '12

10 May '12

commit 10d1ac3f9dda65322b5b9d17e8c7d37de238edf0 Merge: 66cd361 79c4c81 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 10 16:04:19 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5760 | 3 +++ changes/bug5786_range | 8 ++++++++ src/common/util.c | 7 +++++++ src/or/control.c | 10 +++++----- src/test/test_util.c | 15 +++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.2] Add missing CRLFs to AUTHCHALLENGE failure replies
by arma＠torproject.org 10 May '12

10 May '12

commit f6617473700eb4b4ab30255e7176d774c38931cd Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri May 4 02:34:26 2012 +0530 Add missing CRLFs to AUTHCHALLENGE failure replies Fix #5760 --- src/or/control.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index ddfc80e..5ffe63b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2839,13 +2839,13 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strlen("SAFECOOKIE"); } else { connection_write_str_to_buf("513 AUTHCHALLENGE only supports SAFECOOKIE " - "authentication", conn); + "authentication\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } if (!authentication_cookie_is_set) { - connection_write_str_to_buf("515 Cookie authentication is disabled", conn); + connection_write_str_to_buf("515 Cookie authentication is disabled\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; } @@ -2856,7 +2856,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, decode_escaped_string(cp, len - (cp - body), &client_nonce, &client_nonce_len); if (newcp == NULL) { - connection_write_str_to_buf("513 Invalid quoted client nonce", + connection_write_str_to_buf("513 Invalid quoted client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2870,7 +2870,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, if (base16_decode(client_nonce, client_nonce_len, cp, client_nonce_encoded_len) < 0) { - connection_write_str_to_buf("513 Invalid base16 client nonce", + connection_write_str_to_buf("513 Invalid base16 client nonce\r\n", conn); connection_mark_for_close(TO_CONN(conn)); return -1; @@ -2882,7 +2882,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len, cp += strspn(cp, " \t\n\r"); if (*cp != '\0' || cp != body + len) { - connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command", + connection_write_str_to_buf("513 Junk at end of AUTHCHALLENGE command\r\n", conn); connection_mark_for_close(TO_CONN(conn)); tor_free(client_nonce);

1 0