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

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

11 Apr '13

commit 34120549878aa05969b66d9564cdd902adeeb6be Merge: 5c5198e 1b28f36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 14:47:13 2013 -0400 Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4 changes/bug8475 | 4 ++++ src/or/relay.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.4] Fix an uninitialized-var warning in unit tests
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 1b6b8b05642cfa5e951a8b25233191a1ab8dda2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 22 12:38:55 2013 -0400 Fix an uninitialized-var warning in unit tests Found by formorer; fix on 42fb61d172b172, not in any released Tor. --- src/test/test_util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 2c4f804..6e1ee71 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -802,7 +802,7 @@ test_util_strmisc(void) { char buf[1024]; int i; - char *cp, *cp_tmp; + char *cp, *cp_tmp = NULL; /* Test strl operations */ test_eq(5, strlcpy(buf, "Hello", 0));

1 0

[tor/release-0.2.4] The *default* guard lifetime is two months; the *min* is one
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 6196d0e83d78e2e8efff575d490f4cb254415832 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 21 07:22:59 2013 -0400 The *default* guard lifetime is two months; the *min* is one This caused an assertion failure when pruning guards. Fixes bug #8553; bug not in any released Tor. --- src/or/entrynodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5bb0a73..6b21d10 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -459,8 +459,8 @@ static int32_t guards_get_lifetime(void) { const or_options_t *options = get_options(); -#define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */ -#define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ +#define MIN_GUARD_LIFETIME (86400 * 30) /* One months. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ if (options->GuardLifetime >= 1) {

1 0

[tor/release-0.2.4] Bug 7065: Use $ for idhex instead of =
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 914bfe765d72627fddc4bdda3fbd7f77008aca26 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 26 18:49:41 2013 -0700 Bug 7065: Use $ for idhex instead of = --- src/or/circuitbuild.c | 28 ++++++++++++++-------------- src/or/routerparse.c | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 8e768e7..ce552b4 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1539,7 +1539,7 @@ pathbias_count_build_success(origin_circuit_t *circ) guard->circ_successes++; entry_guards_changed(); - log_info(LD_CIRC, "Got success count %f/%f for guard %s=%s", + log_info(LD_CIRC, "Got success count %f/%f for guard %s ($%s)", guard->circ_successes, guard->circ_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); } else { @@ -1558,7 +1558,7 @@ pathbias_count_build_success(origin_circuit_t *circ) if (guard->circ_attempts < guard->circ_successes) { log_notice(LD_BUG, "Unexpectedly high successes counts (%f/%f) " - "for guard %s=%s", + "for guard %s ($%s)", guard->circ_successes, guard->circ_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); } @@ -1626,7 +1626,7 @@ pathbias_count_use_attempt(origin_circuit_t *circ) entry_guards_changed(); log_debug(LD_CIRC, - "Marked circuit %d (%f/%f) as used for guard %s=%s.", + "Marked circuit %d (%f/%f) as used for guard %s ($%s).", circ->global_identifier, guard->use_successes, guard->use_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); @@ -1736,7 +1736,7 @@ pathbias_count_use_success(origin_circuit_t *circ) log_debug(LD_CIRC, "Marked circuit %d (%f/%f) as used successfully for guard " - "%s=%s.", + "%s ($%s).", circ->global_identifier, guard->use_successes, guard->use_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); @@ -2253,7 +2253,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) if (pathbias_get_dropguards(options)) { if (!guard->path_bias_disabled) { log_warn(LD_CIRC, - "Your Guard %s=%s is failing to carry an extremely large " + "Your Guard %s ($%s) is failing to carry an extremely large " "amount of stream on its circuits. " "To avoid potential route manipulation attacks, Tor has " "disabled use of this guard. " @@ -2279,7 +2279,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) } else if (!guard->path_bias_use_extreme) { guard->path_bias_use_extreme = 1; log_warn(LD_CIRC, - "Your Guard %s=%s is failing to carry an extremely large " + "Your Guard %s ($%s) is failing to carry an extremely large " "amount of streams on its circuits. " "This could indicate a route manipulation attack, network " "overload, bad local network connectivity, or a bug. " @@ -2303,7 +2303,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) if (!guard->path_bias_use_noticed) { guard->path_bias_use_noticed = 1; log_notice(LD_CIRC, - "Your Guard %s=%s is failing to carry more streams on its " + "Your Guard %s ($%s) is failing to carry more streams on its " "circuits than usual. " "Most likely this means the Tor network is overloaded " "or your network connection is poor. " @@ -2359,7 +2359,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) if (pathbias_get_dropguards(options)) { if (!guard->path_bias_disabled) { log_warn(LD_CIRC, - "Your Guard %s=%s is failing an extremely large " + "Your Guard %s ($%s) is failing an extremely large " "amount of circuits. " "To avoid potential route manipulation attacks, Tor has " "disabled use of this guard. " @@ -2385,7 +2385,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) } else if (!guard->path_bias_extreme) { guard->path_bias_extreme = 1; log_warn(LD_CIRC, - "Your Guard %s=%s is failing an extremely large " + "Your Guard %s ($%s) is failing an extremely large " "amount of circuits. " "This could indicate a route manipulation attack, " "extreme network overload, or a bug. " @@ -2409,7 +2409,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) if (!guard->path_bias_warned) { guard->path_bias_warned = 1; log_warn(LD_CIRC, - "Your Guard %s=%s is failing a very large " + "Your Guard %s ($%s) is failing a very large " "amount of circuits. " "Most likely this means the Tor network is " "overloaded, but it could also mean an attack against " @@ -2434,7 +2434,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) if (!guard->path_bias_noticed) { guard->path_bias_noticed = 1; log_notice(LD_CIRC, - "Your Guard %s=%s is failing more circuits than " + "Your Guard %s ($%s) is failing more circuits than " "usual. " "Most likely this means the Tor network is overloaded. " "Success counts are %ld/%ld. Use counts are %ld/%ld. " @@ -2495,7 +2495,7 @@ pathbias_scale_close_rates(entry_guard_t *guard) log_info(LD_CIRC, "Scaled pathbias counts to (%f,%f)/%f (%d/%d open) for guard " - "%s=%s", + "%s ($%s)", guard->circ_successes, guard->successful_circuits_closed, guard->circ_attempts, opened_built, opened_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); @@ -2529,7 +2529,7 @@ pathbias_scale_use_rates(entry_guard_t *guard) guard->use_attempts += opened_attempts; log_info(LD_CIRC, - "Scaled pathbias use counts to %f/%f (%d open) for guard %s=%s", + "Scaled pathbias use counts to %f/%f (%d open) for guard %s ($%s)", guard->use_successes, guard->use_attempts, opened_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); entry_guards_changed(); @@ -2554,7 +2554,7 @@ entry_guard_inc_circ_attempt_count(entry_guard_t *guard) pathbias_scale_close_rates(guard); guard->circ_attempts++; - log_info(LD_CIRC, "Got success count %f/%f for guard %s=%s", + log_info(LD_CIRC, "Got success count %f/%f for guard %s ($%s)", guard->circ_successes, guard->circ_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); return 0; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b86864b..a2b4f9e 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2030,7 +2030,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, } } else { log_info(LD_BUG, "Found an entry in networkstatus with no " - "microdescriptor digest. (Router %s=%s at %s:%d.)", + "microdescriptor digest. (Router %s ($%s) at %s:%d.)", rs->nickname, hex_str(rs->identity_digest, DIGEST_LEN), fmt_addr32(rs->addr), rs->or_port); }

1 0

[tor/release-0.2.4] Avoid clang warnings from implicit off_t->size_t cast
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 8b6a952c94bbc7bd3a9dc3356e708654092e08af Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 23 18:50:21 2013 -0400 Avoid clang warnings from implicit off_t->size_t cast --- src/common/crypto_curve25519.c | 2 +- src/test/test_crypto.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 3e4004d..88c723f 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -169,7 +169,7 @@ curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out, end: if (content) { - memwipe(content, 0, st.st_size); + memwipe(content, 0, (size_t) st.st_size); tor_free(content); } if (r != 0) { diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index c531c60..fcaa081 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1097,7 +1097,7 @@ test_crypto_curve25519_persist(void *arg) tor_free(tag); content[69] ^= 0xff; - tt_int_op(0, ==, write_bytes_to_file(fname, content, st.st_size, 1)); + tt_int_op(0, ==, write_bytes_to_file(fname, content, (size_t)st.st_size, 1)); tt_int_op(-1, ==, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); done:

1 0

[tor/release-0.2.4] Fix an EOL@EOF in circuituse.c
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 8e29a7ae1da643197cc237ecb81096cd55913eff Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 20 11:03:18 2013 -0700 Fix an EOL@EOF in circuituse.c --- src/or/circuituse.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d48449f..f02597e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2312,3 +2312,4 @@ mark_circuit_unusable_for_new_conns(origin_circuit_t *circ) circ->unusable_for_new_conns = 1; } +

1 0

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

11 Apr '13

commit 72c651ebdd64d28e0bfe640e37979b84f524abad Merge: 8b6a952 4cc7cc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 26 22:20:08 2013 -0400 Merge branch 'bug7065_v2' into maint-0.2.4 changes/bug7065 | 5 +++++ src/or/circuitbuild.c | 28 ++++++++++++++-------------- src/or/routerparse.c | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-)

1 0

[tor/release-0.2.4] Bug 6572: Use timestamp_created for liveness sanity checks.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 65c0489dd4f0e10230f5c2fbb772a58e03e939bb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 26 20:28:19 2013 -0700 Bug 6572: Use timestamp_created for liveness sanity checks. This should eliminate potential regressions caused by #7341. --- src/or/circuituse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index f02597e..14576f1 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -671,7 +671,7 @@ circuit_expire_building(void) circuit_purpose_to_string(victim->purpose)); } else if (circuit_build_times_count_close(&circ_times, first_hop_succeeded, - victim->timestamp_began.tv_sec)) { + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } }

1 0

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

11 Apr '13

commit fc9a72c6886c83f96f0b322dab92dbc3c5a8f26b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 26 20:29:41 2013 -0700 Changes file for bug6572. --- changes/bug6572 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug6572 b/changes/bug6572 new file mode 100644 index 0000000..6508d1b --- /dev/null +++ b/changes/bug6572 @@ -0,0 +1,4 @@ + o Minor bugfixes (log messages) + - Use circuit creation time for network liveness evaluation. This + should eliminate warning log messages about liveness caused by + changes in timeout evaluation. Fixes bug 6572; bugfix on 0.2.4.8-alpha.

1 0

[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