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

[tor/maint-0.3.0] Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3a60214f32bc6e1ba6d8c6dd6c6abda0c5be1f1e Merge: 16f337e 5e08fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 08:28:46 2017 -0500 Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0 changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Also allow C_MEASURE_TIMEOUT circuits to lack guard state.
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 5e08fc85570173200935b62de2bffee81fed2fc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:12:21 2017 -0500 Also allow C_MEASURE_TIMEOUT circuits to lack guard state. Fixes a case of 21007; bugfix on 0.3.0.1-alpha when prop271 was implemented. Found by toralf. --- changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug21007_case2 b/changes/bug21007_case2 new file mode 100644 index 0000000..4334444 --- /dev/null +++ b/changes/bug21007_case2 @@ -0,0 +1,4 @@ + o Minor bugfixes (guards): + - Don't warn about a missing guard state on timeout-measurement + circuits: they aren't supposed to be using guards. Fixes an + instance of bug 21007; bugfix on 0.3.0.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cd00034..79962e8 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -892,6 +892,27 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, } } +/** + * Return true iff purpose is a purpose for a circuit which is + * allowed to have no guard configured, even if the circuit is multihop + * and guards are enabled. + */ +static int +circuit_purpose_may_omit_guard(int purpose) +{ + switch (purpose) { + case CIRCUIT_PURPOSE_TESTING: + case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: + /* Testing circuits may omit guards because they're measuring + * liveness or performance, and don't want guards to interfere. */ + return 1; + default: + /* All other multihop circuits should use guards if guards are + * enabled. */ + return 0; + } +} + /** This is the backbone function for building circuits. * * If circ's first hop is closed, then we need to build a create @@ -969,7 +990,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) guard_usable_t r; if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && - circ->base_.purpose != CIRCUIT_PURPOSE_TESTING && + ! circuit_purpose_may_omit_guard(circ->base_.purpose) && get_options()->UseEntryGuards) { log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " "guard state",

1 0

[tor/master] Also allow C_MEASURE_TIMEOUT circuits to lack guard state.
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 5e08fc85570173200935b62de2bffee81fed2fc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:12:21 2017 -0500 Also allow C_MEASURE_TIMEOUT circuits to lack guard state. Fixes a case of 21007; bugfix on 0.3.0.1-alpha when prop271 was implemented. Found by toralf. --- changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug21007_case2 b/changes/bug21007_case2 new file mode 100644 index 0000000..4334444 --- /dev/null +++ b/changes/bug21007_case2 @@ -0,0 +1,4 @@ + o Minor bugfixes (guards): + - Don't warn about a missing guard state on timeout-measurement + circuits: they aren't supposed to be using guards. Fixes an + instance of bug 21007; bugfix on 0.3.0.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cd00034..79962e8 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -892,6 +892,27 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, } } +/** + * Return true iff purpose is a purpose for a circuit which is + * allowed to have no guard configured, even if the circuit is multihop + * and guards are enabled. + */ +static int +circuit_purpose_may_omit_guard(int purpose) +{ + switch (purpose) { + case CIRCUIT_PURPOSE_TESTING: + case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: + /* Testing circuits may omit guards because they're measuring + * liveness or performance, and don't want guards to interfere. */ + return 1; + default: + /* All other multihop circuits should use guards if guards are + * enabled. */ + return 0; + } +} + /** This is the backbone function for building circuits. * * If circ's first hop is closed, then we need to build a create @@ -969,7 +990,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) guard_usable_t r; if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && - circ->base_.purpose != CIRCUIT_PURPOSE_TESTING && + ! circuit_purpose_may_omit_guard(circ->base_.purpose) && get_options()->UseEntryGuards) { log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " "guard state",

1 0

[tor/master] Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3a60214f32bc6e1ba6d8c6dd6c6abda0c5be1f1e Merge: 16f337e 5e08fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 08:28:46 2017 -0500 Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0 changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3a60214f32bc6e1ba6d8c6dd6c6abda0c5be1f1e Merge: 16f337e 5e08fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 08:28:46 2017 -0500 Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0 changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 811280013848536e6907b5880f30c75202170044 Merge: 9282355 3a60214 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 08:28:55 2017 -0500 Merge branch 'maint-0.3.0' changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Also allow C_MEASURE_TIMEOUT circuits to lack guard state.
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 5e08fc85570173200935b62de2bffee81fed2fc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 24 11:12:21 2017 -0500 Also allow C_MEASURE_TIMEOUT circuits to lack guard state. Fixes a case of 21007; bugfix on 0.3.0.1-alpha when prop271 was implemented. Found by toralf. --- changes/bug21007_case2 | 4 ++++ src/or/circuitbuild.c | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/changes/bug21007_case2 b/changes/bug21007_case2 new file mode 100644 index 0000000..4334444 --- /dev/null +++ b/changes/bug21007_case2 @@ -0,0 +1,4 @@ + o Minor bugfixes (guards): + - Don't warn about a missing guard state on timeout-measurement + circuits: they aren't supposed to be using guards. Fixes an + instance of bug 21007; bugfix on 0.3.0.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cd00034..79962e8 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -892,6 +892,27 @@ circuit_pick_extend_handshake(uint8_t *cell_type_out, } } +/** + * Return true iff purpose is a purpose for a circuit which is + * allowed to have no guard configured, even if the circuit is multihop + * and guards are enabled. + */ +static int +circuit_purpose_may_omit_guard(int purpose) +{ + switch (purpose) { + case CIRCUIT_PURPOSE_TESTING: + case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: + /* Testing circuits may omit guards because they're measuring + * liveness or performance, and don't want guards to interfere. */ + return 1; + default: + /* All other multihop circuits should use guards if guards are + * enabled. */ + return 0; + } +} + /** This is the backbone function for building circuits. * * If circ's first hop is closed, then we need to build a create @@ -969,7 +990,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) guard_usable_t r; if (! circ->guard_state) { if (circuit_get_cpath_len(circ) != 1 && - circ->base_.purpose != CIRCUIT_PURPOSE_TESTING && + ! circuit_purpose_may_omit_guard(circ->base_.purpose) && get_options()->UseEntryGuards) { log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " "guard state",

1 0

[tor/maint-0.3.0] Replace entry_guard_get_by_id_digest_for_guard_selection impl.
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit f5995692dadf9bc038455d7e701be84937f28d82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 10:28:54 2017 -0500 Replace entry_guard_get_by_id_digest_for_guard_selection impl. We already implemented this whole function somewhere else; no need to have the same code twice. --- src/or/entrynodes.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3bb5169..93dd2bd 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2901,13 +2901,7 @@ entry_guard_t * entry_guard_get_by_id_digest_for_guard_selection(guard_selection_t *gs, const char *digest) { - tor_assert(gs != NULL); - - SMARTLIST_FOREACH(gs->sampled_entry_guards, entry_guard_t *, entry, - if (tor_memeq(digest, entry->identity, DIGEST_LEN)) - return entry; - ); - return NULL; + return get_sampled_guard_with_id(gs, (const uint8_t*)digest); } /** Return the node_t associated with a single entry_guard_t. May

1 0

[tor/master] Replace entry_guard_get_by_id_digest_for_guard_selection impl.
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit f5995692dadf9bc038455d7e701be84937f28d82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 10:28:54 2017 -0500 Replace entry_guard_get_by_id_digest_for_guard_selection impl. We already implemented this whole function somewhere else; no need to have the same code twice. --- src/or/entrynodes.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3bb5169..93dd2bd 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2901,13 +2901,7 @@ entry_guard_t * entry_guard_get_by_id_digest_for_guard_selection(guard_selection_t *gs, const char *digest) { - tor_assert(gs != NULL); - - SMARTLIST_FOREACH(gs->sampled_entry_guards, entry_guard_t *, entry, - if (tor_memeq(digest, entry->identity, DIGEST_LEN)) - return entry; - ); - return NULL; + return get_sampled_guard_with_id(gs, (const uint8_t*)digest); } /** Return the node_t associated with a single entry_guard_t. May

1 0

[tor/maint-0.3.0] Merge branch 'bug21027_v2_squashed' into maint-0.3.0
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 16f337e7639c42b5c6106d6bc9828cb9e6614054 Merge: eef8bd4 1582ada Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 08:16:43 2017 -0500 Merge branch 'bug21027_v2_squashed' into maint-0.3.0 changes/bug21027 | 8 ++++++++ src/or/bridges.c | 27 +++++++++++++++++++++++++++ src/or/bridges.h | 4 ++++ src/or/entrynodes.c | 37 ++++++++++++++++--------------------- 4 files changed, 55 insertions(+), 21 deletions(-)

1 0