February 2019 - tor-commits - lists.torproject.org

[tor/master] Add circuit time check before logging about relaxing circuit time
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 78220aae1ed3994453413559ff8b068578b31818 Author: José M. Guisado <guigom(a)riseup.net> Date: Wed Jan 23 00:04:57 2019 +0100 Add circuit time check before logging about relaxing circuit time Signed-off-by: José M. Guisado <guigom(a)riseup.net> --- changes/bug28698 | 3 +++ src/core/or/circuituse.c | 30 ++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/changes/bug28698 b/changes/bug28698 new file mode 100644 index 000000000..716aa0c55 --- /dev/null +++ b/changes/bug28698 @@ -0,0 +1,3 @@ + o Minor bugfix (logging): + - Avoid logging about relaxing circuits when their time is fixed. + Fixes bug 28698; bugfix on 0.2.4.7-alpha diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 8918dd077..e306307c4 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -545,6 +545,8 @@ circuit_expire_building(void) SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *,victim) { struct timeval cutoff; + bool fixed_time = circuit_build_times_disabled(get_options()); + if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */ victim->marked_for_close) /* don't mess with marked circs */ continue; @@ -599,17 +601,19 @@ circuit_expire_building(void) if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) { int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state == CPATH_STATE_OPEN; - log_info(LD_CIRC, - "No circuits are opened. Relaxing timeout for circuit %d " - "(a %s %d-hop circuit in state %s with channel state %s).", - TO_ORIGIN_CIRCUIT(victim)->global_identifier, - circuit_purpose_to_string(victim->purpose), - TO_ORIGIN_CIRCUIT(victim)->build_state ? - TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : - -1, - circuit_state_to_string(victim->state), - victim->n_chan ? - channel_state_to_string(victim->n_chan->state) : "none"); + if (!fixed_time) { + log_info(LD_CIRC, + "No circuits are opened. Relaxing timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s).", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state ? + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : + -1, + circuit_state_to_string(victim->state), + victim->n_chan ? + channel_state_to_string(victim->n_chan->state) : "none"); + } /* We count the timeout here for CBT, because technically this * was a timeout, and the timeout value needs to reset if we @@ -623,7 +627,8 @@ circuit_expire_building(void) } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); const double build_close_ms = get_circuit_build_close_time_ms(); - log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, + if (!fixed_time) { + log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, "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 " @@ -637,6 +642,7 @@ circuit_expire_building(void) victim->n_chan ? channel_state_to_string(victim->n_chan->state) : "none", (long)build_close_ms); + } } }

1 0

[tor/master] Merge branch 'bug28698_035' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 26873bc4edb057041e5cc130ec90f4fbc2d8beb8 Merge: 5c87add92 78220aae1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:27:18 2019 -0500 Merge branch 'bug28698_035' into maint-0.4.0 changes/bug28698 | 3 +++ src/core/or/circuituse.c | 30 ++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 8a5c66cbb0adf1ef63f1c5f1048dfbc4c6f7267d Merge: 485803dff 26873bc4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:27:21 2019 -0500 Merge branch 'maint-0.4.0' changes/bug28698 | 3 +++ src/core/or/circuituse.c | 30 ++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'bug28698_035' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 26873bc4edb057041e5cc130ec90f4fbc2d8beb8 Merge: 5c87add92 78220aae1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:27:18 2019 -0500 Merge branch 'bug28698_035' into maint-0.4.0 changes/bug28698 | 3 +++ src/core/or/circuituse.c | 30 ++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.0] Add circuit time check before logging about relaxing circuit time
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 78220aae1ed3994453413559ff8b068578b31818 Author: José M. Guisado <guigom(a)riseup.net> Date: Wed Jan 23 00:04:57 2019 +0100 Add circuit time check before logging about relaxing circuit time Signed-off-by: José M. Guisado <guigom(a)riseup.net> --- changes/bug28698 | 3 +++ src/core/or/circuituse.c | 30 ++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/changes/bug28698 b/changes/bug28698 new file mode 100644 index 000000000..716aa0c55 --- /dev/null +++ b/changes/bug28698 @@ -0,0 +1,3 @@ + o Minor bugfix (logging): + - Avoid logging about relaxing circuits when their time is fixed. + Fixes bug 28698; bugfix on 0.2.4.7-alpha diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 8918dd077..e306307c4 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -545,6 +545,8 @@ circuit_expire_building(void) SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *,victim) { struct timeval cutoff; + bool fixed_time = circuit_build_times_disabled(get_options()); + if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */ victim->marked_for_close) /* don't mess with marked circs */ continue; @@ -599,17 +601,19 @@ circuit_expire_building(void) if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) { int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state == CPATH_STATE_OPEN; - log_info(LD_CIRC, - "No circuits are opened. Relaxing timeout for circuit %d " - "(a %s %d-hop circuit in state %s with channel state %s).", - TO_ORIGIN_CIRCUIT(victim)->global_identifier, - circuit_purpose_to_string(victim->purpose), - TO_ORIGIN_CIRCUIT(victim)->build_state ? - TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : - -1, - circuit_state_to_string(victim->state), - victim->n_chan ? - channel_state_to_string(victim->n_chan->state) : "none"); + if (!fixed_time) { + log_info(LD_CIRC, + "No circuits are opened. Relaxing timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s).", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state ? + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : + -1, + circuit_state_to_string(victim->state), + victim->n_chan ? + channel_state_to_string(victim->n_chan->state) : "none"); + } /* We count the timeout here for CBT, because technically this * was a timeout, and the timeout value needs to reset if we @@ -623,7 +627,8 @@ circuit_expire_building(void) } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); const double build_close_ms = get_circuit_build_close_time_ms(); - log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, + if (!fixed_time) { + log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, "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 " @@ -637,6 +642,7 @@ circuit_expire_building(void) victim->n_chan ? channel_state_to_string(victim->n_chan->state) : "none", (long)build_close_ms); + } } }

1 0

[tor/maint-0.4.0] Disable unstable circuit padding unittest.
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit f5a6d4c6ea78e73e8f27292fac6d4153e8e84aa0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 14 12:07:10 2019 +0200 Disable unstable circuit padding unittest. until #29298 is implemented. --- changes/bug29298 | 5 +++++ src/test/test_circuitpadding.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/bug29298 b/changes/bug29298 new file mode 100644 index 000000000..df12db77d --- /dev/null +++ b/changes/bug29298 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, circuit padding): + - Disabled unstable circuit padding unittest that was causing intermittent + test failures because of ill-defined small histogram. Such histograms + will be allowed again after 29298 is implemented. Fixes second case of + bug 29122; bugfix on 0.4.0.1-alpha. \ No newline at end of file diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 12a07fa95..eee1edc50 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -46,7 +46,6 @@ void test_circuitpadding_conditions(void *arg); void test_circuitpadding_serialize(void *arg); void test_circuitpadding_rtt(void *arg); void test_circuitpadding_tokens(void *arg); -void test_circuitpadding_circuitsetup_machine(void *arg); static void simulate_single_hop_extend(circuit_t *client, circuit_t *mid_relay, @@ -1809,6 +1808,8 @@ test_circuitpadding_conditions(void *arg) return; } +/** Disabled unstable test until #29298 is implemented (see #29122) */ +#if 0 void test_circuitpadding_circuitsetup_machine(void *arg) { @@ -2054,6 +2055,7 @@ test_circuitpadding_circuitsetup_machine(void *arg) return; } +#endif /** Helper function: Initializes a padding machine where every state uses the * uniform probability distribution. */ @@ -2340,11 +2342,11 @@ test_circuitpadding_global_rate_limiting(void *arg) { #name, test_##name, (flags), NULL, NULL } struct testcase_t circuitpadding_tests[] = { - //TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, 0), TEST_CIRCUITPADDING(circuitpadding_tokens, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_negotiation, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_wronghop, TT_FORK), - TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, TT_FORK), + /** Disabled unstable test until #29298 is implemented (see #29122) */ + // TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_conditions, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_rtt, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_sample_distribution, TT_FORK),

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 5c87add923d14c90db8c84cca843754e7715df9e Merge: 94f7e53d0 f5a6d4c6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:21:51 2019 -0500 Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0 changes/bug29298 | 5 +++++ src/test/test_circuitpadding.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 5c87add923d14c90db8c84cca843754e7715df9e Merge: 94f7e53d0 f5a6d4c6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:21:51 2019 -0500 Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0 changes/bug29298 | 5 +++++ src/test/test_circuitpadding.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 485803dffe8bfc7852c26144a113716fc84cd998 Merge: 9a158a45b 5c87add92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 11:21:54 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29298 | 5 +++++ src/test/test_circuitpadding.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)

1 0

[tor/master] Disable unstable circuit padding unittest.
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit f5a6d4c6ea78e73e8f27292fac6d4153e8e84aa0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 14 12:07:10 2019 +0200 Disable unstable circuit padding unittest. until #29298 is implemented. --- changes/bug29298 | 5 +++++ src/test/test_circuitpadding.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/changes/bug29298 b/changes/bug29298 new file mode 100644 index 000000000..df12db77d --- /dev/null +++ b/changes/bug29298 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, circuit padding): + - Disabled unstable circuit padding unittest that was causing intermittent + test failures because of ill-defined small histogram. Such histograms + will be allowed again after 29298 is implemented. Fixes second case of + bug 29122; bugfix on 0.4.0.1-alpha. \ No newline at end of file diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 12a07fa95..eee1edc50 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -46,7 +46,6 @@ void test_circuitpadding_conditions(void *arg); void test_circuitpadding_serialize(void *arg); void test_circuitpadding_rtt(void *arg); void test_circuitpadding_tokens(void *arg); -void test_circuitpadding_circuitsetup_machine(void *arg); static void simulate_single_hop_extend(circuit_t *client, circuit_t *mid_relay, @@ -1809,6 +1808,8 @@ test_circuitpadding_conditions(void *arg) return; } +/** Disabled unstable test until #29298 is implemented (see #29122) */ +#if 0 void test_circuitpadding_circuitsetup_machine(void *arg) { @@ -2054,6 +2055,7 @@ test_circuitpadding_circuitsetup_machine(void *arg) return; } +#endif /** Helper function: Initializes a padding machine where every state uses the * uniform probability distribution. */ @@ -2340,11 +2342,11 @@ test_circuitpadding_global_rate_limiting(void *arg) { #name, test_##name, (flags), NULL, NULL } struct testcase_t circuitpadding_tests[] = { - //TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, 0), TEST_CIRCUITPADDING(circuitpadding_tokens, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_negotiation, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_wronghop, TT_FORK), - TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, TT_FORK), + /** Disabled unstable test until #29298 is implemented (see #29122) */ + // TEST_CIRCUITPADDING(circuitpadding_circuitsetup_machine, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_conditions, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_rtt, TT_FORK), TEST_CIRCUITPADDING(circuitpadding_sample_distribution, TT_FORK),

1 0