- tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 17 Aug '12

17 Aug '12

commit e2fac8a4921a1e0fe3ecff84a1ba159150a63d2e Merge: 0f92e65 5b02117 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:43 2012 +0100 Merge branch 'maint-2.3' build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[torbrowser/maint-2.2] bump recommended-versions to 2.2.38-1 for stable tbbs
by erinn＠torproject.org 17 Aug '12

17 Aug '12

commit e2976698bdabfb5db4ce9212d58edd3803a75830 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 17 22:09:21 2012 +0100 bump recommended-versions to 2.2.38-1 for stable tbbs --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index d26819d..46c8079 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,9 +1,9 @@ [ -"2.2.37-2-MacOS-i386", -"2.2.37-2-MacOS-x86_64", -"2.2.37-2-Windows", -"2.2.37-2-Linux-i686", -"2.2.37-2-Linux-x86_64", +"2.2.38-1-MacOS-i386", +"2.2.38-1-MacOS-x86_64", +"2.2.38-1-Windows", +"2.2.38-1-Linux-i686", +"2.2.38-1-Linux-x86_64", "2.3.20-alpha-1-MacOS-i386", "2.3.20-alpha-1-Windows", "2.3.20-alpha-1-Linux-i386",

1 0

[tor/master] Never emit the "opt" prefix in any directory stuff
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit e13e9c40c829d15fb71310b0638fff859b85580a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 15:47:07 2012 -0400 Never emit the "opt" prefix in any directory stuff Fix for bug 5124. --- changes/bug5124 | 4 ++++ src/or/dirserv.c | 2 +- src/or/policies.c | 3 +-- src/or/rephist.c | 2 +- src/or/router.c | 14 +++++++------- src/test/test_dir.c | 6 +++--- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/changes/bug5124 b/changes/bug5124 new file mode 100644 index 0000000..5999f7e --- /dev/null +++ b/changes/bug5124 @@ -0,0 +1,4 @@ + o Removed code: + - No longer include the "opt" prefix when generating routerinfos + or v2 directories: it has been needless since Tor 0.1.2. Closes + ticket 5124. \ No newline at end of file diff --git a/src/or/dirserv.c b/src/or/dirserv.c index bfebbcd..d29c11d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2114,7 +2114,7 @@ routerstatus_format_entry(char *buf, size_t buf_len, /* length of "opt v \n" */ #define V_LINE_OVERHEAD 7 if (version && strlen(version) < MAX_V_LINE_LEN - V_LINE_OVERHEAD) { - if (tor_snprintf(cp, buf_len - (cp-buf), "opt v %s\n", version)<0) { + if (tor_snprintf(cp, buf_len - (cp-buf), "v %s\n", version)<0) { log_warn(LD_BUG, "Unable to print router version."); return -1; } diff --git a/src/or/policies.c b/src/or/policies.c index b2b962d..201ed04 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1006,8 +1006,7 @@ policy_write_item(char *buf, size_t buflen, addr_policy_t *policy, else addrpart = addrbuf; - result = tor_snprintf(buf, buflen, "%s%s%s %s", - (is_ip6&&format_for_desc)?"opt ":"", + result = tor_snprintf(buf, buflen, "%s%s %s", is_accept ? "accept" : "reject", (is_ip6&&format_for_desc)?"6":"", addrpart); diff --git a/src/or/rephist.c b/src/or/rephist.c index fa02f98..1c5b511 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1531,7 +1531,7 @@ rep_hist_get_bandwidth_lines(void) const char *desc = NULL; size_t len; - /* opt [dirreq-](read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n... */ + /* [dirreq-](read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n... */ /* The n,n,n part above. Largest representation of a uint64_t is 20 chars * long, plus the comma. */ #define MAX_HIST_VALUE_LEN 21*NUM_TOTALS diff --git a/src/or/router.c b/src/or/router.c index 352c456..a766dfb 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2053,9 +2053,9 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, "router %s %s %d 0 %d\n" "%s" "platform %s\n" - "opt protocols Link 1 2 Circuit 1\n" + "protocols Link 1 2 Circuit 1\n" "published %s\n" - "opt fingerprint %s\n" + "fingerprint %s\n" "uptime %ld\n" "bandwidth %d %d %d\n" "%s%s%s%s" @@ -2074,15 +2074,15 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, (int) router->bandwidthrate, (int) router->bandwidthburst, (int) router->bandwidthcapacity, - has_extra_info_digest ? "opt extra-info-digest " : "", + has_extra_info_digest ? "extra-info-digest " : "", has_extra_info_digest ? extra_info_digest : "", has_extra_info_digest ? "\n" : "", - options->DownloadExtraInfo ? "opt caches-extra-info\n" : "", + options->DownloadExtraInfo ? "caches-extra-info\n" : "", onion_pkey, identity_pkey, family_line, - we_are_hibernating() ? "opt hibernating 1\n" : "", - options->HidServDirectoryV2 ? "opt hidden-service-dir\n" : "", - options->AllowSingleHopExits ? "opt allow-single-hop-exits\n" : ""); + we_are_hibernating() ? "hibernating 1\n" : "", + options->HidServDirectoryV2 ? "hidden-service-dir\n" : "", + options->AllowSingleHopExits ? "allow-single-hop-exits\n" : ""); tor_free(family_line); tor_free(onion_pkey); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 83c6120..84705d0 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -147,9 +147,9 @@ test_dir_formats(void) "platform Tor "VERSION" on ", sizeof(buf2)); strlcat(buf2, get_uname(), sizeof(buf2)); strlcat(buf2, "\n" - "opt protocols Link 1 2 Circuit 1\n" + "protocols Link 1 2 Circuit 1\n" "published 1970-01-01 00:00:00\n" - "opt fingerprint ", sizeof(buf2)); + "fingerprint ", sizeof(buf2)); test_assert(!crypto_pk_get_fingerprint(pk2, fingerprint, 1)); strlcat(buf2, fingerprint, sizeof(buf2)); strlcat(buf2, "\nuptime 0\n" @@ -161,7 +161,7 @@ test_dir_formats(void) strlcat(buf2, pk1_str, sizeof(buf2)); strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, pk2_str, sizeof(buf2)); - strlcat(buf2, "opt hidden-service-dir\n", sizeof(buf2)); + strlcat(buf2, "hidden-service-dir\n", sizeof(buf2)); strlcat(buf2, "reject *:*\nrouter-signature\n", sizeof(buf2)); buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same * twice */

1 0

[tor/master] Merge remote-tracking branch 'public/bug5124'
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 1c64f99a1a74cac4074ddefa958fd4ae7acddcb2 Merge: 63dfc1d e13e9c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 16:05:09 2012 -0400 Merge remote-tracking branch 'public/bug5124' changes/bug5124 | 4 ++++ src/or/dirserv.c | 2 +- src/or/policies.c | 3 +-- src/or/rephist.c | 2 +- src/or/router.c | 14 +++++++------- src/test/test_dir.c | 6 +++--- 6 files changed, 17 insertions(+), 14 deletions(-)

1 0

[tor/master] Merge branch 'bug6468_squashed'
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 63dfc1d9b6e6d488f32c99c3ffad882f6fbe0f51 Merge: a9d5628 d9746bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 16:01:43 2012 -0400 Merge branch 'bug6468_squashed' changes/bug6468 | 8 ++++++++ src/or/connection.c | 28 ++++------------------------ 2 files changed, 12 insertions(+), 24 deletions(-)

1 0

[tor/master] Remove needless flush-on-write code.
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit d9746bd468f551d1ada57d962b20eddd15256ce9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 25 18:34:14 2012 -0400 Remove needless flush-on-write code. Long ago, before we had cell queues, it was necessary to maybe call connection_handle_write() from connectino_write_to_buf_impl() on OR connections, so that we wouldn't get into a loop of reading infinite amounts of data and queueing it all on an outbuf before bothering to write any data. If that doesn't sounds like what our code does now, you're right: right now, we won't stick more than OR_CONN_HIGHWATER bytes of cells on an outbuf, and we won't suck more than CELL_QUEUE_HIGHWATER_SIZE cells off any edge connection. So, there's no more call for that code. Removing this code will simplify our data flow, and that should be something we can all get behind. --- changes/bug6468 | 8 ++++++++ src/or/connection.c | 28 ++++------------------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/changes/bug6468 b/changes/bug6468 new file mode 100644 index 0000000..fb624da --- /dev/null +++ b/changes/bug6468 @@ -0,0 +1,8 @@ + o Minor bugfixes: + - Remove some now-needless code that tried to aggressively flush + OR connections as data was added to them. Since 0.2.0.1-alpha, + our cell queue logic has saved us from the failure mode that + this code was supposed to prevent. Removing this code will limit + the number of baroque control flow paths through Tor's network + logic. Reported pseudonymously on IRC. Fix for bug 6468; + bigfix on 0.2.0.1-alpha. \ No newline at end of file diff --git a/src/or/connection.c b/src/or/connection.c index a1d5354..c224496 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3365,13 +3365,6 @@ connection_flush(connection_t *conn) return connection_handle_write(conn, 1); } -/** OpenSSL TLS record size is 16383; this is close. The goal here is to - * push data out as soon as we know there's enough for a TLS record, so - * during periods of high load we won't read entire megabytes from - * input before pushing any data out. It also has the feature of not - * growing huge outbufs unless something is slow. */ -#define MIN_TLS_FLUSHLEN 15872 - /** Append len bytes of string onto conn's * outbuf, and ask it to start writing. * @@ -3380,10 +3373,9 @@ connection_flush(connection_t *conn) * negative, this is the last data to be compressed, and the connection's zlib * state should be flushed. * - * If it's an OR conn and an entire TLS record is ready, then try to - * flush the record now. Similarly, if it's a local control connection - * and a 64k chunk is ready, try to flush it all, so we don't end up with - * many megabytes of controller info queued at once. + * If it's a local control connection and a 64k chunk is ready, try to flush + * it all, so we don't end up with many megabytes of controller info queued at + * once. */ void _connection_write_to_buf_impl(const char *string, size_t len, @@ -3451,7 +3443,6 @@ _connection_write_to_buf_impl(const char *string, size_t len, if (zlib) { conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen; } else { - ssize_t extra = 0; conn->outbuf_flushlen += len; /* Should we try flushing the outbuf now? */ @@ -3461,14 +3452,7 @@ _connection_write_to_buf_impl(const char *string, size_t len, return; } - if (conn->type == CONN_TYPE_OR && - conn->outbuf_flushlen-len < MIN_TLS_FLUSHLEN && - conn->outbuf_flushlen >= MIN_TLS_FLUSHLEN) { - /* We just pushed outbuf_flushlen to MIN_TLS_FLUSHLEN or above; - * we can send out a full TLS frame now if we like. */ - extra = conn->outbuf_flushlen - MIN_TLS_FLUSHLEN; - conn->outbuf_flushlen = MIN_TLS_FLUSHLEN; - } else if (conn->type == CONN_TYPE_CONTROL && + if (conn->type == CONN_TYPE_CONTROL && !connection_is_rate_limited(conn) && conn->outbuf_flushlen-len < 1<<16 && conn->outbuf_flushlen >= 1<<16) { @@ -3488,10 +3472,6 @@ _connection_write_to_buf_impl(const char *string, size_t len, } return; } - if (extra) { - conn->outbuf_flushlen += extra; - connection_start_writing(conn); - } } }

1 0

[tor/master] Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic.
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 9ed87b37d04705983b11cd995140e8864454bf5e Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Jul 19 20:41:23 2012 +0200 Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic. Closes #6423. --- changes/bug6423 | 3 +++ src/or/routerlist.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug6423 b/changes/bug6423 new file mode 100644 index 0000000..2ea4f14 --- /dev/null +++ b/changes/bug6423 @@ -0,0 +1,3 @@ + o Minor features: + - Consider new, removed or changed IPv6 OR ports a non cosmetic + change. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4979b93..3c39e36 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5160,6 +5160,8 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2) if (strcasecmp(r1->address, r2->address) || strcasecmp(r1->nickname, r2->nickname) || r1->or_port != r2->or_port || + !tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) || + r1->ipv6_orport != r2->ipv6_orport || r1->dir_port != r2->dir_port || r1->purpose != r2->purpose || crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit a9d56289ee53da6aa98a0c8b89796b7872ff6e1a Merge: 851197f 9ed87b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 15:59:40 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6423 | 3 +++ src/or/routerlist.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic.
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 9ed87b37d04705983b11cd995140e8864454bf5e Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Jul 19 20:41:23 2012 +0200 Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic. Closes #6423. --- changes/bug6423 | 3 +++ src/or/routerlist.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug6423 b/changes/bug6423 new file mode 100644 index 0000000..2ea4f14 --- /dev/null +++ b/changes/bug6423 @@ -0,0 +1,3 @@ + o Minor features: + - Consider new, removed or changed IPv6 OR ports a non cosmetic + change. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4979b93..3c39e36 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5160,6 +5160,8 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2) if (strcasecmp(r1->address, r2->address) || strcasecmp(r1->nickname, r2->nickname) || r1->or_port != r2->or_port || + !tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) || + r1->ipv6_orport != r2->ipv6_orport || r1->dir_port != r2->dir_port || r1->purpose != r2->purpose || crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||

1 0

[tor/master] Fix more warnings from openbsd_malloc
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 4c8fcba86c35bd8e2cfde4c65f394c7837638ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 13:49:52 2012 -0400 Fix more warnings from openbsd_malloc Apparently, (void)writev is not enough to suppress the "you are ignoring the return value!" warnings on Linux. Instead, remove the whole warning/error logic when compiling openbsd_malloc for Tor: we can't use it. --- src/common/OpenBSD_malloc_Linux.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 39c8f8b..da82729 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -450,6 +450,7 @@ extern char *__progname; static void wrterror(const char *p) { +#ifndef BUILDING_FOR_TOR const char *q = " error: "; struct iovec iov[5]; @@ -463,8 +464,10 @@ wrterror(const char *p) iov[3].iov_len = strlen(p); iov[4].iov_base = (char*)"\n"; iov[4].iov_len = 1; - (void) writev(STDERR_FILENO, iov, 5); - + writev(STDERR_FILENO, iov, 5); +#else + (void)p; +#endif suicide = 1; #ifdef MALLOC_STATS if (malloc_stats) @@ -478,14 +481,17 @@ wrterror(const char *p) static void wrtwarning(const char *p) { +#ifndef BUILDING_FOR_TOR const char *q = " warning: "; struct iovec iov[5]; +#endif if (malloc_abort) wrterror(p); else if (malloc_silent) return; +#ifndef BUILDING_FOR_TOR iov[0].iov_base = __progname; iov[0].iov_len = strlen(__progname); iov[1].iov_base = (char*)malloc_func; @@ -498,6 +504,9 @@ wrtwarning(const char *p) iov[4].iov_len = 1; (void) writev(STDERR_FILENO, iov, 5); +#else + (void)p; +#endif } #ifdef MALLOC_STATS

1 0