- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug1352' into maint-0.2.2
by nickm＠torproject.org 12 May '11

12 May '11

commit b47f574c1e27b8665e9e2658409645a3831e7aa4 Merge: 8057b73 bcdffc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:14:10 2011 -0400 Merge branch 'bug1352' into maint-0.2.2 changes/bug1352 | 4 ++++ src/or/directory.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 12 May '11

12 May '11

commit 3968e8d14b7f6282963223b0fd4f4ca3afb60c61 Merge: 7649adb b47f574 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:14:44 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug1352 | 4 ++++ src/or/directory.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --cc src/or/directory.c index 313c6c5,8c6581a..2821619 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -650,11 -617,10 +650,11 @@@ connection_dir_request_failed(dir_conne if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) { log_info(LD_DIR, "Giving up on directory server at '%s'; retrying", conn->_base.address); - connection_dir_download_networkstatus_failed(conn, -1); + connection_dir_download_v2_networkstatus_failed(conn, -1); } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) { - log_info(LD_DIR, "Giving up on directory server at '%s'; retrying", + log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from " + "directory server at '%s'; retrying", conn->_base.address); if (conn->router_purpose == ROUTER_PURPOSE_BRIDGE) connection_dir_bridge_routerdesc_failed(conn);

1 0

[tor/maint-0.2.2] Rename connection_dir_download_networkstatus_failed: be clear that it means v2
by nickm＠torproject.org 12 May '11

12 May '11

commit 50c6b55757be615be828cec21d3178e8b0501e51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 21:23:32 2011 -0400 Rename connection_dir_download_networkstatus_failed: be clear that it means v2 --- src/or/directory.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 0c095fe..2ac7811 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -64,7 +64,7 @@ static int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose); static char *http_get_header(const char *headers, const char *which); static void http_set_address_origin(const char *headers, connection_t *conn); -static void connection_dir_download_networkstatus_failed( +static void connection_dir_download_v2_networkstatus_failed( dir_connection_t *conn, int status_code); static void connection_dir_download_routerdesc_failed(dir_connection_t *conn); static void connection_dir_bridge_routerdesc_failed(dir_connection_t *conn); @@ -616,7 +616,7 @@ connection_dir_request_failed(dir_connection_t *conn) if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) { log_info(LD_DIR, "Giving up on directory server at '%s'; retrying", conn->_base.address); - connection_dir_download_networkstatus_failed(conn, -1); + connection_dir_download_v2_networkstatus_failed(conn, -1); } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) { log_info(LD_DIR, "Giving up on directory server at '%s'; retrying", @@ -644,7 +644,7 @@ connection_dir_request_failed(dir_connection_t *conn) * retry the fetch now, later, or never. */ static void -connection_dir_download_networkstatus_failed(dir_connection_t *conn, +connection_dir_download_v2_networkstatus_failed(dir_connection_t *conn, int status_code) { if (!conn->requested_resource) { @@ -1653,7 +1653,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) status_code, escaped(reason), conn->_base.address, conn->_base.port, conn->requested_resource); tor_free(body); tor_free(headers); tor_free(reason); - connection_dir_download_networkstatus_failed(conn, status_code); + connection_dir_download_v2_networkstatus_failed(conn, status_code); return -1; } if (conn->requested_resource &&

1 0

[tor/maint-0.2.2] Rate-limit v2 networkstatus download fail warnings
by nickm＠torproject.org 12 May '11

12 May '11

commit bcdffc0f80c0d5c9ed8c3858d95f351e14f9c722 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 21:25:24 2011 -0400 Rate-limit v2 networkstatus download fail warnings This fixes part of 1352. We don't care deeply about these warnings, since v2 networkstatuses aren't a big deal. --- changes/bug1352 | 4 ++++ src/or/directory.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/changes/bug1352 b/changes/bug1352 new file mode 100644 index 0000000..bde0192 --- /dev/null +++ b/changes/bug1352 @@ -0,0 +1,4 @@ + o Minor features + - Rate-limit a warning about failures to download v2 networkstatus + documents. Resolves part of bug 1352. + diff --git a/src/or/directory.c b/src/or/directory.c index 2ac7811..972dec5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1647,11 +1647,17 @@ connection_dir_client_reached_eof(dir_connection_t *conn) log_info(LD_DIR,"Received networkstatus objects (size %d) from server " "'%s:%d'", (int)body_len, conn->_base.address, conn->_base.port); if (status_code != 200) { - log_warn(LD_DIR, - "Received http status code %d (%s) from server " - "'%s:%d' while fetching \"/tor/status/%s\". I'll try again soon.", - status_code, escaped(reason), conn->_base.address, - conn->_base.port, conn->requested_resource); + static ratelim_t warning_limit = RATELIM_INIT(3600); + char *m; + if ((m = rate_limit_log(&warning_limit, now))) { + log_warn(LD_DIR, + "Received http status code %d (%s) from server " + "'%s:%d' while fetching \"/tor/status/%s\". " + "I'll try again soon.%s", + status_code, escaped(reason), conn->_base.address, + conn->_base.port, conn->requested_resource, m); + tor_free(m); + } tor_free(body); tor_free(headers); tor_free(reason); connection_dir_download_v2_networkstatus_failed(conn, status_code); return -1;

1 0

[tor/maint-0.2.2] Merge branch 'bug1352' into maint-0.2.2
by nickm＠torproject.org 12 May '11

12 May '11

commit b47f574c1e27b8665e9e2658409645a3831e7aa4 Merge: 8057b73 bcdffc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:14:10 2011 -0400 Merge branch 'bug1352' into maint-0.2.2 changes/bug1352 | 4 ++++ src/or/directory.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-)

1 0

[tor/master] Fix crash when read_file_to_string() fails in SAVECONF
by nickm＠torproject.org 12 May '11

12 May '11

commit 13847b8db6b676c4f2951a4195758f395b7551a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:05:41 2011 -0400 Fix crash when read_file_to_string() fails in SAVECONF The new behavior is to try to rename the old file if there is one there that we can't read. In all likelihood, that will fail too, but at least we tried, and at least it won't crash. --- changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug3135 b/changes/bug3135 new file mode 100644 index 0000000..d761123 --- /dev/null +++ b/changes/bug3135 @@ -0,0 +1,6 @@ + o Minor bugfixes + - Do not crash when our configuration file becomes unreadable + (usually due to a permissions change) between when we start + up and when a controller calls SAVECONF. Fixes bug 3135; + bugfix on 0.0.9pre6. + diff --git a/src/or/config.c b/src/or/config.c index 9cd8149..fbfa771 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4625,7 +4625,7 @@ write_configuration_file(const char *fname, or_options_t *options) switch (file_status(fname)) { case FN_FILE: old_val = read_file_to_str(fname, 0, NULL); - if (strcmpstart(old_val, GENERATED_FILE_PREFIX)) { + if (!old_val || strcmpstart(old_val, GENERATED_FILE_PREFIX)) { rename_old = 1; } tor_free(old_val);

1 0

[tor/master] Merge branch 'bug3135' into maint-0.2.1
by nickm＠torproject.org 12 May '11

12 May '11

commit d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 Merge: e7b10e5 13847b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:49:44 2011 -0400 Merge branch 'bug3135' into maint-0.2.1 changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 12 May '11

12 May '11

commit 8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea Merge: 7206d78 d1c7f65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:52:26 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 12 May '11

12 May '11

commit 7649adbce60c7ab615e233f9e9ce41c22df8134c Merge: 6d5478a 8057b73 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:55:29 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Merge branch 'bug3135' into maint-0.2.1
by nickm＠torproject.org 12 May '11

12 May '11

commit d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 Merge: e7b10e5 13847b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 22:49:44 2011 -0400 Merge branch 'bug3135' into maint-0.2.1 changes/bug3135 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0