June 2012 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jun '12

23 Jun '12

commit 6d7885403960e2a62a759d77a17da95f44c7c286 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 09:15:05 2012 +0000 Update translations for gettor --- my/gettor.po | 130 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 65 insertions(+), 65 deletions(-) diff --git a/my/gettor.po b/my/gettor.po index 54b3d6c..dbbce78 100644 --- a/my/gettor.po +++ b/my/gettor.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor … [View More]

1 0

[torspec/master] neena got (reasonably) confused by context-sensitive config options
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit 22959c4230a53a1f3b22418fc8b46c0abd40ad7a Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 03:46:32 2012 -0400 neena got (reasonably) confused by context-sensitive config options --- control-spec.txt | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 7e7e37e..40c88e8 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -223,12 +223,14 @@ "513 syntax error in configuration … [View More]

1 0

[tor/master] Disable warning for marked-but-reading in main.c
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 0600e8cab17d2128d663b31d93b93ddc1ab95ee2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 11:48:03 2012 -0400 Disable warning for marked-but-reading in main.c It turns out this can happen. Even though there is no reason for connections to be marked but reading, we leave them reading anyway, so warning here is unwarranted. Let's turn that back on once we do something sensible and disable reading when we mark. Bugfix for 6203 on Tor … [View More]0.2.3.17-beta. Thanks to cypherpunks for pointing out the general stupidity of the original code here. --- changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/changes/bug6203 b/changes/bug6203 new file mode 100644 index 0000000..bf96753 --- /dev/null +++ b/changes/bug6203 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. + diff --git a/src/or/main.c b/src/or/main.c index f8740d7..1f3117b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -848,7 +848,10 @@ conn_close_if_marked(int i) "Holding conn (fd %d) open for more flushing.", (int)conn->s)); conn->timestamp_lastwritten = now; /* reset so we can flush more */ - } else if (sz == 0) { /* retval is also 0 */ + } else if (sz == 0) { + /* Also, retval==0. If we get here, we didn't want to write anything + * (because of rate-limiting) and we didn't. */ + /* Connection must flush before closing, but it's being rate-limited. * Let's remove from Libevent, and mark it as blocked on bandwidth * so it will be re-added on next token bucket refill. Prevents @@ -860,6 +863,13 @@ conn_close_if_marked(int i) connection_stop_writing(conn); } if (connection_is_reading(conn)) { + /* XXXX024 We should make this code unreachable; if a connection is + * marked for close and flushing, there is no point in reading to it + * at all. Further, checking at this point is a bit of a hack: it + * would make much more sense to react in + * connection_handle_read_impl, or to just stop reading in + * mark_and_flush */ +#if 0 #define MARKED_READING_RATE 180 static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE); char *m; @@ -870,6 +880,7 @@ conn_close_if_marked(int i) conn_state_to_string(conn->type, conn->state), m); tor_free(m); } +#endif conn->read_blocked_on_bw = 1; connection_stop_reading(conn); } [View Less]

1 0

[tor/master] Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit a9de982c343b0d83078d8e46b1a06e483c8595ec Merge: 4a7e412 0600e8c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:33:14 2012 -0400 Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3 changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix a regression bug in AllowDotExit
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit c239c57d3c9a8ddff7db6ed20e836844b17efdae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 19:45:28 2012 -0400 Fix a regression bug in AllowDotExit The code that detected the source of a remapped address checked that an address mapping's source was a given rewrite rule if addr_orig had no .exit, and addr did have a .exit after processing that rule. But addr_orig was formatted for logging: it was not the original address at all, but … [View More]rather was the address escaped for logging and possibly replaced with "[scrubbed]". This new logic will correctly set ADDRMAPSRC_NONE in the case when the address starts life as a .exit address, so that AllowDotExit can work again. Fixes bug 6211; bugfix on 0.2.3.17-beta --- changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug6211 b/changes/bug6211 new file mode 100644 index 0000000..2c8d9b8 --- /dev/null +++ b/changes/bug6211 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a bug that stopped AllowDotExit from working on addresses + that had an entry in the DNS cache. Fixes bug 6211; bugfix on + 0.2.3.17-beta. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 210c2e0..9892078 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1100,8 +1100,8 @@ addressmap_match_superdomains(char *address) * address starts out as a non-exit address, and we remap it to an .exit * address at any point, then set *exit_source_out to the * address_entry_source_t of the first such rule. Set *exit_source_out - * to ADDRMAPSRC_NONE if there is no such rewrite. - * + * to ADDRMAPSRC_NONE if there is no such rewrite, or if the original address + * was a .exit. */ int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, @@ -1111,10 +1111,12 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, int rewrites; time_t expires = TIME_MAX; addressmap_entry_source_t exit_source = ADDRMAPSRC_NONE; + char *addr_orig = tor_strdup(address); + char *log_addr_orig = NULL; for (rewrites = 0; rewrites < 16; rewrites++) { int exact_match = 0; - char *addr_orig = tor_strdup(escaped_safe_str_client(address)); + log_addr_orig = tor_strdup(escaped_safe_str_client(address)); ent = strmap_get(addressmap, address); @@ -1125,7 +1127,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, !strcasecmp(address, ent->new_address)) { /* This is a rule like *.example.com example.com, and we just got * "example.com" */ - tor_free(addr_orig); goto done; } @@ -1133,7 +1134,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } if (!ent || !ent->new_address) { - tor_free(addr_orig); goto done; } @@ -1151,10 +1151,11 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } log_info(LD_APP, "Addressmap: rewriting %s to %s", - addr_orig, escaped_safe_str_client(address)); + log_addr_orig, escaped_safe_str_client(address)); if (ent->expires > 1 && ent->expires < expires) expires = ent->expires; - tor_free(addr_orig); + + tor_free(log_addr_orig); } log_warn(LD_CONFIG, "Loop detected: we've rewritten %s 16 times! Using it as-is.", @@ -1162,6 +1163,8 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, /* it's fine to rewrite a rewrite, but don't loop forever */ done: + tor_free(addr_orig); + tor_free(log_addr_orig); if (exit_source_out) *exit_source_out = exit_source; if (expires_out) [View Less]

1 0

[tor/master] Merge remote-tracking branch 'public/bug6211' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit ebda15e4b5fe4d2e154526befcc6b9ad8f635813 Merge: a9de982 c239c57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:38:59 2012 -0400 Merge remote-tracking branch 'public/bug6211' into maint-0.2.3 changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

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

23 Jun '12

commit 7761c1d6ac639580b686dac4b5d0607060b8c8f6 Merge: a08bbef ebda15e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:41:12 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6203 | 5 +++++ changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- src/or/main.c | 13 ++++++++++++- 4 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.3] Fix a regression bug in AllowDotExit
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit c239c57d3c9a8ddff7db6ed20e836844b17efdae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 19:45:28 2012 -0400 Fix a regression bug in AllowDotExit The code that detected the source of a remapped address checked that an address mapping's source was a given rewrite rule if addr_orig had no .exit, and addr did have a .exit after processing that rule. But addr_orig was formatted for logging: it was not the original address at all, but … [View More]rather was the address escaped for logging and possibly replaced with "[scrubbed]". This new logic will correctly set ADDRMAPSRC_NONE in the case when the address starts life as a .exit address, so that AllowDotExit can work again. Fixes bug 6211; bugfix on 0.2.3.17-beta --- changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/bug6211 b/changes/bug6211 new file mode 100644 index 0000000..2c8d9b8 --- /dev/null +++ b/changes/bug6211 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a bug that stopped AllowDotExit from working on addresses + that had an entry in the DNS cache. Fixes bug 6211; bugfix on + 0.2.3.17-beta. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 210c2e0..9892078 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1100,8 +1100,8 @@ addressmap_match_superdomains(char *address) * address starts out as a non-exit address, and we remap it to an .exit * address at any point, then set *exit_source_out to the * address_entry_source_t of the first such rule. Set *exit_source_out - * to ADDRMAPSRC_NONE if there is no such rewrite. - * + * to ADDRMAPSRC_NONE if there is no such rewrite, or if the original address + * was a .exit. */ int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, @@ -1111,10 +1111,12 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, int rewrites; time_t expires = TIME_MAX; addressmap_entry_source_t exit_source = ADDRMAPSRC_NONE; + char *addr_orig = tor_strdup(address); + char *log_addr_orig = NULL; for (rewrites = 0; rewrites < 16; rewrites++) { int exact_match = 0; - char *addr_orig = tor_strdup(escaped_safe_str_client(address)); + log_addr_orig = tor_strdup(escaped_safe_str_client(address)); ent = strmap_get(addressmap, address); @@ -1125,7 +1127,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, !strcasecmp(address, ent->new_address)) { /* This is a rule like *.example.com example.com, and we just got * "example.com" */ - tor_free(addr_orig); goto done; } @@ -1133,7 +1134,6 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } if (!ent || !ent->new_address) { - tor_free(addr_orig); goto done; } @@ -1151,10 +1151,11 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, } log_info(LD_APP, "Addressmap: rewriting %s to %s", - addr_orig, escaped_safe_str_client(address)); + log_addr_orig, escaped_safe_str_client(address)); if (ent->expires > 1 && ent->expires < expires) expires = ent->expires; - tor_free(addr_orig); + + tor_free(log_addr_orig); } log_warn(LD_CONFIG, "Loop detected: we've rewritten %s 16 times! Using it as-is.", @@ -1162,6 +1163,8 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, /* it's fine to rewrite a rewrite, but don't loop forever */ done: + tor_free(addr_orig); + tor_free(log_addr_orig); if (exit_source_out) *exit_source_out = exit_source; if (expires_out) [View Less]

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6211' into maint-0.2.3
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit ebda15e4b5fe4d2e154526befcc6b9ad8f635813 Merge: a9de982 c239c57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:38:59 2012 -0400 Merge remote-tracking branch 'public/bug6211' into maint-0.2.3 changes/bug6211 | 4 ++++ src/or/connection_edge.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.3] Disable warning for marked-but-reading in main.c
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 0600e8cab17d2128d663b31d93b93ddc1ab95ee2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 19 11:48:03 2012 -0400 Disable warning for marked-but-reading in main.c It turns out this can happen. Even though there is no reason for connections to be marked but reading, we leave them reading anyway, so warning here is unwarranted. Let's turn that back on once we do something sensible and disable reading when we mark. Bugfix for 6203 on Tor … [View More]0.2.3.17-beta. Thanks to cypherpunks for pointing out the general stupidity of the original code here. --- changes/bug6203 | 5 +++++ src/or/main.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/changes/bug6203 b/changes/bug6203 new file mode 100644 index 0000000..bf96753 --- /dev/null +++ b/changes/bug6203 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable a spurious warning about reading on a marked and flushing + connection. We shouldn't be doing that, but apparently we + sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta. + diff --git a/src/or/main.c b/src/or/main.c index f8740d7..1f3117b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -848,7 +848,10 @@ conn_close_if_marked(int i) "Holding conn (fd %d) open for more flushing.", (int)conn->s)); conn->timestamp_lastwritten = now; /* reset so we can flush more */ - } else if (sz == 0) { /* retval is also 0 */ + } else if (sz == 0) { + /* Also, retval==0. If we get here, we didn't want to write anything + * (because of rate-limiting) and we didn't. */ + /* Connection must flush before closing, but it's being rate-limited. * Let's remove from Libevent, and mark it as blocked on bandwidth * so it will be re-added on next token bucket refill. Prevents @@ -860,6 +863,13 @@ conn_close_if_marked(int i) connection_stop_writing(conn); } if (connection_is_reading(conn)) { + /* XXXX024 We should make this code unreachable; if a connection is + * marked for close and flushing, there is no point in reading to it + * at all. Further, checking at this point is a bit of a hack: it + * would make much more sense to react in + * connection_handle_read_impl, or to just stop reading in + * mark_and_flush */ +#if 0 #define MARKED_READING_RATE 180 static ratelim_t marked_read_lim = RATELIM_INIT(MARKED_READING_RATE); char *m; @@ -870,6 +880,7 @@ conn_close_if_marked(int i) conn_state_to_string(conn->type, conn->state), m); tor_free(m); } +#endif conn->read_blocked_on_bw = 1; connection_stop_reading(conn); } [View Less]

1 0