April 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Add some missing case values to please clang
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 7f8098d2d0e719f3ea9e35a7f930477f8fc7682a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 27 21:04:08 2013 -0400 Add some missing case values to please clang It seems that some versions of clang that would prefer the -Wswitch-enum compiler flag to warn about switch statements with missing enum values, even if those switch statements have a default. Fixes bug 8598; bugfix on 0.2.4.10-alpha. --- changes/bug8598 | 6 ++++++ src/or/circuitbuild.c | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug8598 b/changes/bug8598 new file mode 100644 index 0000000..e31c8f3 --- /dev/null +++ b/changes/bug8598 @@ -0,0 +1,6 @@ + o Bugfixes: + - Fix compilation warning with some versions of clang that would prefer + the -Wswitch-enum compiler flag to warn about switch statements with + missing enum values, even if those switch statements have a default: + statement. Fixes bug 8598; bugfix on 0.2.4.10-alpha. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index ce552b4..aec6c6a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2010,6 +2010,9 @@ pathbias_check_close(origin_circuit_t *ocirc, int reason) pathbias_count_use_failed(ocirc); break; + case PATH_STATE_NEW_CIRC: + case PATH_STATE_BUILD_ATTEMPTED: + case PATH_STATE_ALREADY_COUNTED: default: // Other states are uninteresting. No stats to count. break;

1 0

[tor/release-0.2.4] Changes file for #7065
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 4cc7cc28f8040b3a8f3faaca82abe27bbec0b744 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 26 18:55:12 2013 -0700 Changes file for #7065 (revised by nickm) --- changes/bug7065 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug7065 b/changes/bug7065 new file mode 100644 index 0000000..1ca6841 --- /dev/null +++ b/changes/bug7065 @@ -0,0 +1,5 @@ + o Minor bugfix (log cleanups): + - Eliminate several instances where we use Nickname=ID to refer to + nodes in logs. Use Nickname (ID) instead. (Elsewhere, we still use + $ID=Nickname, which is also acceptable.) Fixes bug #7065. Bugfix + on 0.2.3.21-rc, 0.2.4.5-alpha, 0.2.4.8-alpha, and 0.2.4.10-alpha.

1 0

[tor/release-0.2.4] Clarify liveness log message and lower it to notice.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 87d50d0617d89290ca263aa6f415e45a0c37a11a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 16:22:43 2013 -0700 Clarify liveness log message and lower it to notice. It could just be due to small clock jumps, after all. --- src/or/circuitstats.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index fe9c80d..1d7812b 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -1232,11 +1232,11 @@ circuit_build_times_network_close(circuit_build_times_t *cbt, format_local_iso_time(last_live_buf, cbt->liveness.network_last_live); format_local_iso_time(start_time_buf, start_time); format_local_iso_time(now_buf, now); - log_warn(LD_BUG, - "Circuit somehow completed a hop while the network was " - "not live. Network was last live at %s, but circuit launched " - "at %s. It's now %s.", last_live_buf, start_time_buf, - now_buf); + log_notice(LD_CIRC, + "A circuit somehow completed a hop while the network was " + "not live. The network was last live at %s, but the circuit " + "launched at %s. It's now %s. This could mean your clock " + "changed.", last_live_buf, start_time_buf, now_buf); } cbt->liveness.nonlive_timeouts++; if (cbt->liveness.nonlive_timeouts == 1) {

1 0

[tor/release-0.2.4] Make PathsNeededToBuildCircuits option work.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 1bce70a9e3b33d02b2bae4b94a1774db38d19d3a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 28 09:42:49 2013 +0100 Make PathsNeededToBuildCircuits option work. --- src/or/config.c | 2 +- src/or/nodelist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a238a1a..ffa984b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2485,7 +2485,7 @@ options_validate(or_options_t *old_options, or_options_t *options, log_warn(LD_CONFIG, "PathsNeededToBuildCircuits is too low. Increasing " "to 0.25"); options->PathsNeededToBuildCircuits = 0.25; - } else if (options->PathsNeededToBuildCircuits < 0.95) { + } else if (options->PathsNeededToBuildCircuits > 0.95) { log_warn(LD_CONFIG, "PathsNeededToBuildCircuits is too high. Decreasing " "to 0.95"); options->PathsNeededToBuildCircuits = 0.95; diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 5f3b843..178f084 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1418,7 +1418,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, const networkstatus_t *ns) { #define DFLT_PCT_USABLE_NEEDED 60 - if (options->PathsNeededToBuildCircuits >= 1.0) { + if (options->PathsNeededToBuildCircuits >= 0.0) { return options->PathsNeededToBuildCircuits; } else { return networkstatus_get_param(ns, "min_paths_for_circs_pct",

1 0

[tor/release-0.2.4] Tighten prose in 8590 manpage fix
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit cd5048d61e64371ea1f7756cefacd9e731f11002 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 27 21:58:07 2013 -0400 Tighten prose in 8590 manpage fix --- doc/tor.1.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5dc4bc8..c502c57 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1431,9 +1431,10 @@ is non-zero): that they are in the same \'family', Tor clients will not use them in the same circuit. (Each server only needs to list the other servers in its family; it doesn't need to list itself, but it won't hurt.) Do not list - any bridge relay as it would compromise its concealment. When listing a - node, it is preferable to do so as a fingerprint as opposed to a nickname - as fingerprints are a more reliable mechanism for identifying a node. + any bridge relay as it would compromise its concealment. + + + When listing a node, it's better to list it by fingerprint than by + nickname: fingerprints are more reliable. **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19

1 0

[tor/release-0.2.4] First try on ticket 8590
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 5a3eacf88c89c4d29cac2e324a381a3fd4982fa1 Author: Patrick R McDonald <marlowe(a)antagonism.org> Date: Mon Mar 25 17:31:16 2013 -0500 First try on ticket 8590 --- doc/tor.1.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5727ec3..5dc4bc8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1431,7 +1431,9 @@ is non-zero): that they are in the same \'family', Tor clients will not use them in the same circuit. (Each server only needs to list the other servers in its family; it doesn't need to list itself, but it won't hurt.) Do not list - any bridge relay as it would compromise its concealment. + any bridge relay as it would compromise its concealment. When listing a + node, it is preferable to do so as a fingerprint as opposed to a nickname + as fingerprints are a more reliable mechanism for identifying a node. **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19

1 0

[tor/release-0.2.4] Add a changes file for #8599
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 96c0a42a926abec333327c3e9668a5721bab9afc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 28 09:33:24 2013 -0400 Add a changes file for #8599 --- changes/bug8599 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug8599 b/changes/bug8599 new file mode 100644 index 0000000..204ef58 --- /dev/null +++ b/changes/bug8599 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix some logic errors when the user manually overrides the + PathsNeededToBuildCircuits option in torrc. Fixes bug 8599; bugfix + on 0.2.4.10-alpha.

1 0

[tor/release-0.2.4] Add changes file for bug 7799's log message changes.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit cc641ff5b05b2f8bc831ff28fa5d4226933d18a0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 15:33:58 2013 -0700 Add changes file for bug 7799's log message changes. Note this does not close bug 7799. --- changes/bug7799 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug7799 b/changes/bug7799 new file mode 100644 index 0000000..1bb5597 --- /dev/null +++ b/changes/bug7799 @@ -0,0 +1,3 @@ + o Minor changes (log clarification) + - Add more detail to a log message about relaxed timeouts. Hopefully + this additional detail will allow us to diagnose the cause of bug 7799.

1 0

[tor/release-0.2.4] Add detail to log messages related to bug 7799.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 66586da9bc023bf60b2d18e02004a4e278b73359 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 27 15:34:54 2013 -0700 Add detail to log messages related to bug 7799. Note this does not solve bug 7799, it is only to help us diagnose it. --- src/or/circuituse.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 14576f1..bbf219a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -536,8 +536,13 @@ circuit_expire_building(void) int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state == CPATH_STATE_OPEN; log_info(LD_CIRC, - "No circuits are opened. Relaxing timeout for " - "a circuit with channel state %s. %d guards are live.", + "No circuits are opened. Relaxing timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s). " + "%d guards are live.", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, + circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), num_live_entry_guards(0)); @@ -552,10 +557,14 @@ circuit_expire_building(void) } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, - "No circuits are opened. Relaxed timeout for " - "a circuit with channel state %s to %ldms. " - "However, it appears the circuit has timed out anyway. " - "%d guards are live.", + "No circuits are opened. Relaxed timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s) to " + "%ldms. However, it appears the circuit has timed out " + "anyway. %d guards are live.", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, + circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), (long)circ_times.close_ms, num_live_entry_guards(0)); }

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 8b4728ebd681c395e4a34eabf50035ebd1f05d7d Merge: 0cf327d 686aaa5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 12:38:11 2013 -0400 Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4 changes/bug8180 | 7 +++++++ src/or/config.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --cc src/or/config.c index 15138f9,aa34f87..2b94b83 --- a/src/or/config.c +++ b/src/or/config.c @@@ -1,7 -1,7 +1,7 @@@ - /* Copyright (c) 2001 Matej Pfajfar. + /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2012, The Tor Project, Inc. */ + * Copyright (c) 2007-2013, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@@ -2601,11 -3664,11 +2601,11 @@@ options_validate(or_options_t *old_opti if (options->UseBridges && options->EntryNodes) REJECT("You cannot set both UseBridges and EntryNodes."); - if (options->EntryNodes && !options->UseEntryGuards) - log_warn(LD_CONFIG, "EntryNodes is set, but UseEntryGuards is disabled. " - "EntryNodes will be ignored."); + if (options->EntryNodes && !options->UseEntryGuards) { + REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); + } - options->_AllowInvalid = 0; + options->AllowInvalid_ = 0; if (options->AllowInvalidNodes) { SMARTLIST_FOREACH_BEGIN(options->AllowInvalidNodes, const char *, cp) { if (!strcasecmp(cp, "entry"))

1 0