- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Only authorities should automatically download v2 networkstatus documents
by nickm＠torproject.org 09 May '11

09 May '11

commit cd42ae71850985ed8dd34ae73dc6265a643fcb13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 10:05:32 2011 -0400 Only authorities should automatically download v2 networkstatus documents Clients and relays haven't used them since early 0.2.0.x. The only remaining use by authorities learning about new relays ahead of scedule; see proposal 147 for what we intend to do about that. We're leaving in an option (FetchV2Networkstatus) to manually fetch v2 networkstatuses, because apparently dnsel and maybe bwauth want them. This fixes bug 3022. --- changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/bug3022 b/changes/bug3022 new file mode 100644 index 0000000..9472e6d --- /dev/null +++ b/changes/bug3022 @@ -0,0 +1,6 @@ + o Removed features + - Caches no longer download and serve v2 networkstatus documents + unless FetchV2Networkstatus flag is set: these documents haven't + haven't been used by clients or relays since 0.2.0.x. Resolves + bug 3022. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 04a0537..c408aa9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1171,6 +1171,12 @@ if DirPort is non-zero): Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above. +**FetchV2Networkstatus** **0**|**1**:: + If set, we try to fetch the (obsolete, unused) version 2 network status + consensus documents from the directory authorities. No currently + supported Tor version uses them. (Default: 0.) + + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index f003e4d..ab9c5db 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -255,6 +255,7 @@ static config_var_t _option_vars[] = { V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), + V(FetchV2Networkstatus, BOOL, "0"), #ifdef WIN32 V(GeoIPFile, FILENAME, "<default>"), #else diff --git a/src/or/directory.c b/src/or/directory.c index 0c095fe..68734e6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -353,6 +353,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: type = V2_AUTHORITY; + prefer_authority = 1; /* Only v2 authorities have these anyway. */ break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4f6fe15..a50d3ca 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1356,7 +1356,7 @@ update_networkstatus_downloads(time_t now) or_options_t *options = get_options(); if (should_delay_dir_fetches(options)) return; - if (directory_fetches_dir_info_early(options)) + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) update_v2_networkstatus_cache_downloads(now); update_consensus_networkstatus_downloads(now); update_certificate_downloads(now); diff --git a/src/or/or.h b/src/or/or.h index 7d354c8..30179e5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2489,7 +2489,9 @@ typedef struct { /** Boolean: do we publish hidden service descriptors to the HS auths? */ int PublishHidServDescriptors; int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */ - int FetchHidServDescriptors; /** and hidden service descriptors? */ + int FetchHidServDescriptors; /**< and hidden service descriptors? */ + int FetchV2Networkstatus; /**< Do we fetch v2 networkstatus documents when + * we don't need to? */ int HidServDirectoryV2; /**< Do we participate in the HS DHT? */ int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden

1 0

[tor/master] Remove a duplicated line, found by clang
by nickm＠torproject.org 09 May '11

09 May '11

commit d7d25558fafbff15fb10c6e226824f9f0f6d99c7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 04:45:48 2011 +0200 Remove a duplicated line, found by clang --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 6e7bbd5..fc2097f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1240,7 +1240,7 @@ connection_connect(connection_t *conn, const char *address, { int s, inprogress = 0; char addrbuf[256]; - struct sockaddr *dest_addr = (struct sockaddr*) addrbuf; + struct sockaddr *dest_addr; socklen_t dest_addr_len; or_options_t *options = get_options(); int protocol_family;

1 0

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

09 May '11

commit 0b3166fffa0e5e19c63fd95538f87d634444d28c Merge: 330116f 9da4e25 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:20:04 2011 -0400 Merge branch 'clang_fixes' into maint-0.2.2 changes/dirvote_null_deref | 4 ++++ changes/mdesc_null_deref | 5 +++++ src/or/circuitbuild.c | 12 +++++++++++- src/or/connection.c | 2 +- src/or/connection_or.c | 3 +-- src/or/control.c | 5 ++++- src/or/dirvote.c | 6 +++--- src/or/microdesc.c | 2 +- src/or/or.h | 4 +++- 9 files changed, 33 insertions(+), 10 deletions(-)

1 0

[tor/master] Remove some dead code, found by clang
by nickm＠torproject.org 09 May '11

09 May '11

commit 9da4e25183317ea87d1e7f14e9b13e0530ea0240 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 04:50:15 2011 +0200 Remove some dead code, found by clang --- src/or/connection_or.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 4b932ec..c6049d5 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1414,9 +1414,8 @@ connection_or_send_netinfo(or_connection_t *conn) len = append_address_to_payload(out, &my_addr); if (len < 0) return -1; - out += len; } else { - *out++ = 0; + *out = 0; } connection_or_write_cell_to_buf(&cell, conn);

1 0

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

09 May '11

commit acd6a4856bccff92eb241b18066ca7df577ab5f2 Merge: e36f9d1 0b3166f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:36:40 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection.c changes/dirvote_null_deref | 4 ++++ changes/mdesc_null_deref | 5 +++++ src/or/circuitbuild.c | 12 +++++++++++- src/or/connection.c | 2 +- src/or/connection_or.c | 3 +-- src/or/control.c | 5 ++++- src/or/dirvote.c | 6 +++--- src/or/microdesc.c | 2 +- src/or/or.h | 4 +++- 9 files changed, 33 insertions(+), 10 deletions(-) diff --cc src/or/connection.c index 02ae7ee,fc2097f..e7f2b00 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1283,8 -1240,8 +1283,8 @@@ connection_connect(connection_t *conn, { int s, inprogress = 0; char addrbuf[256]; - struct sockaddr *dest_addr = (struct sockaddr*) addrbuf; + struct sockaddr *dest_addr; - socklen_t dest_addr_len; + int dest_addr_len; or_options_t *options = get_options(); int protocol_family;

1 0

[tor/master] Fix a docstring
by nickm＠torproject.org 09 May '11

09 May '11

commit 532c13693e97565fe50a8a788d669d3ec94ad822 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 02:16:24 2011 +0200 Fix a docstring --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 9f7739a..28780d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3875,7 +3875,7 @@ static int bootstrap_problems = 0; * information and initial circuits. * * status is the new status, that is, what task we will be doing - * next. percent is zero if we just started this task, else it + * next. progress is zero if we just started this task, else it * represents progress on the task. */ void control_event_bootstrap(bootstrap_status_t status, int progress)

1 0

[tor/master] Add an assert to un-confuse clang's analyzer
by nickm＠torproject.org 09 May '11

09 May '11

commit 58a16a4d6f47728e029cc8380604bda262a40d30 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 02:20:29 2011 +0200 Add an assert to un-confuse clang's analyzer The analyzer assumed that bootstrap_percent could be less than 0 when we call control_event_bootstrap_problem(), which would mean we're calling log_fn() with undefined values. The assert makes it clear this can't happen. --- src/or/control.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 28780d2..926a465 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3931,6 +3931,9 @@ control_event_bootstrap_problem(const char *warn, int reason) char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; + /* bootstrap_percent must not be in "undefined" state here. */ + tor_assert(status >= 0); + if (bootstrap_percent == 100) return; /* already bootstrapped; nothing to be done here. */

1 0

[tor/master] Appease clang - and my tortured mind
by nickm＠torproject.org 09 May '11

09 May '11

commit 80e57af50fe06ac76733ee99644c5efe797b2b8c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 03:01:25 2011 +0200 Appease clang - and my tortured mind This possible div by 0 warning from clang's analyzer was quite fun to track down. Turns out the current behaviour is safe. --- src/or/circuitbuild.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0e033a5..2189e0e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -559,7 +559,9 @@ circuit_build_times_create_histogram(circuit_build_times_t *cbt, * Return the Pareto start-of-curve parameter Xm. * * Because we are not a true Pareto curve, we compute this as the - * weighted average of the N=3 most frequent build time bins. + * weighted average of the N most frequent build time bins. N is either + * 1 if we don't have enough circuit build time data collected, or + * determined by the consensus parameter cbtnummodes (default 3). */ static build_time_t circuit_build_times_get_xm(circuit_build_times_t *cbt) @@ -572,6 +574,9 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) int n=0; int num_modes = circuit_build_times_default_num_xm_modes(); + tor_assert(nbins > 0); + tor_assert(num_modes > 0); + // Only use one mode if < 1000 buildtimes. Not enough data // for multiple. if (cbt->total_build_times < CBT_NCIRCUITS_TO_OBSERVE) @@ -579,6 +584,7 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) nth_max_bin = (build_time_t*)tor_malloc_zero(num_modes*sizeof(build_time_t)); + /* Determine the N most common build times */ for (i = 0; i < nbins; i++) { if (histogram[i] >= histogram[nth_max_bin[0]]) { nth_max_bin[0] = i; @@ -600,6 +606,10 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } + /* The following assert is safe, because we don't get called when we + * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + tor_assert(bin_counts > 0); + ret /= bin_counts; tor_free(histogram); tor_free(nth_max_bin);

1 0

[tor/master] CONN_LOG_PROTECT()'s first argument may not be 0
by nickm＠torproject.org 09 May '11

09 May '11

commit 8ebb3ce6e27c104e35d65662c04d23795f2b5605 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 03:24:04 2011 +0200 CONN_LOG_PROTECT()'s first argument may not be 0 Make that explicit by adding an assert and removing a null-check. All of its callers currently depend on the argument being non-null anyway. Silences a few clang complaints. --- src/or/or.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 7d354c8..f693ad9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3203,7 +3203,9 @@ typedef enum buildtimeout_set_event_t { */ #define CONN_LOG_PROTECT(conn, stmt) \ STMT_BEGIN \ - int _log_conn_is_control = (conn && conn->type == CONN_TYPE_CONTROL); \ + int _log_conn_is_control; \ + tor_assert(conn); \ + _log_conn_is_control = (conn->type == CONN_TYPE_CONTROL); \ if (_log_conn_is_control) \ disable_control_logging(); \ STMT_BEGIN stmt; STMT_END; \

1 0

[tor/master] Fix a potential null deref when rebuilding md cache
by nickm＠torproject.org 09 May '11

09 May '11

commit 1827e60976d54d1917dfc54bdf62b4818662ac12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 04:23:35 2011 +0200 Fix a potential null deref when rebuilding md cache Issue discovered using clang's static analyzer --- changes/mdesc_null_deref | 5 +++++ src/or/microdesc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/mdesc_null_deref b/changes/mdesc_null_deref new file mode 100644 index 0000000..30f0280 --- /dev/null +++ b/changes/mdesc_null_deref @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid a possible null-pointer dereference when rebuilding the mdesc + cache without actually having any descriptors to cache. Bugfix on + 0.2.2.6-alpha. Issue discovered using clang's static analyzer. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 73d2285..5740c40 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -423,7 +423,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) cache->journal_len = 0; cache->bytes_dropped = 0; - new_size = (int)cache->cache_content->size; + new_size = cache->cache_content ? (int)cache->cache_content->size : 0; log_info(LD_DIR, "Done rebuilding microdesc cache. " "Saved %d bytes; %d still used.", orig_size-new_size, new_size);

1 0