- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Unmap microdesc cache before replacing it.
by nickm＠torproject.org 12 May '11

12 May '11

commit bdff7e3299d78cd2f7aa4a31e5f57c1aeef5ffa1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 11:19:52 2011 -0400 Unmap microdesc cache before replacing it. If we do a replace-then-munmap, windows will never actually rewrite the microdesc cache. Found by wanoskarnet; bugfix on 0.2.2.6-alpha. --- changes/md_cache_replace | 6 ++++++ src/or/microdesc.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/md_cache_replace b/changes/md_cache_replace new file mode 100644 index 0000000..88e029c --- /dev/null +++ b/changes/md_cache_replace @@ -0,0 +1,6 @@ + o Minor bugfixes + - Avoid a bug that would keep us from replacing a microdescriptor + cache on Windows. (We would try to replace the file while still + holding it open. That's fine on Unix, but Windows doesn't let us + do that.) Bugfix on 0.2.2.6-alpha; bug found by wanoskarnet. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 5740c40..1554aca 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -399,10 +399,11 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } - finish_writing_to_file(open_file); /*XXX Check me.*/ - if (cache->cache_content) tor_munmap_file(cache->cache_content); + + finish_writing_to_file(open_file); /*XXX Check me.*/ + cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0

r24744: {website} add the dist to tor.webersiedlung.at mirror (website/trunk)
by Andrew Lewman 12 May '11

12 May '11

Author: phobos Date: 2011-05-12 14:09:44 +0000 (Thu, 12 May 2011) New Revision: 24744 Modified: website/trunk/update-mirrors.pl Log: add the dist to tor.webersiedlung.at mirror Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-05-12 12:26:29 UTC (rev 24743) +++ website/trunk/update-mirrors.pl 2011-05-12 14:09:44 UTC (rev 24744) @@ -583,7 +583,7 @@ httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "", + httpDistMirror => "http://tor.webersiedlung.at/dist/", httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "",

1 0

r24743: {projects} remove the slide transitions. (projects/presentations)
by Andrew Lewman 12 May '11

12 May '11

Author: phobos Date: 2011-05-12 12:26:29 +0000 (Thu, 12 May 2011) New Revision: 24743 Modified: projects/presentations/2011-slide-masters.odp projects/presentations/2011-slide-masters.pdf Log: remove the slide transitions. Modified: projects/presentations/2011-slide-masters.odp =================================================================== (Binary files differ) Modified: projects/presentations/2011-slide-masters.pdf =================================================================== (Binary files differ)

1 0

r24742: {projects} it's an evil network, not timing attacks. (projects/presentations)
by Andrew Lewman 12 May '11

12 May '11

Author: phobos Date: 2011-05-12 09:26:40 +0000 (Thu, 12 May 2011) New Revision: 24742 Modified: projects/presentations/2011-slide-masters.odp projects/presentations/2011-slide-masters.pdf Log: it's an evil network, not timing attacks. Modified: projects/presentations/2011-slide-masters.odp =================================================================== (Binary files differ) Modified: projects/presentations/2011-slide-masters.pdf =================================================================== (Binary files differ)

1 0

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

11 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/master] Rate-limit v2 networkstatus download fail warnings
by nickm＠torproject.org 11 May '11

11 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/master] Merge branch 'bug1352' into maint-0.2.2
by nickm＠torproject.org 11 May '11

11 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 11 May '11

11 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 11 May '11

11 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 11 May '11

11 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