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

[tor/master] Revert "Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min"
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 41324b5ae1334a40baa87785ad18d1a4d9df5322 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 2 16:47:47 2017 +0200 Revert "Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min" This reverts commit 5298ab59170be74aed20e04e5378ec66eef6476e. --- src/or/entrynodes.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index c3c576c..729e4b0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3365,14 +3365,7 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) * guards in our list, since these are the guards that we typically use for * circuits. */ num_primary_to_check = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); - /* - We had added this to try to guarantee that we'd not normally try a guard - without a descriptor, even if we didn't use the first guard. But it led - to problems with the chutney bridges+ipv6-min test. A better solution is - needed. - - num_primary_to_check++; - */ + num_primary_to_check++; SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard);

1 0

[tor/master] Fix failing bridges+ipv6-min integration test.
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 6cab0f8ad712def4f5a9bdfb9d11b0e773f7f76a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Mar 2 16:28:11 2017 +0200 Fix failing bridges+ipv6-min integration test. The bridges+ipv6-min integration test has a client with bridges: Bridge 127.0.0.1:5003 Bridge [::1]:5003 which got stuck in guard_selection_have_enough_dir_info_to_build_circuits() because it couldn't find the descriptor of both bridges. Specifically, the guard_has_descriptor() function could not find the node_t of the [::1] bridge, because the [::1] bridge had no identity digest assigned to it. After further examination, it seems that during fetching the descriptor for our bridges, we used the CERTS cell to fill the identity digest of 127.0.0.1:5003 properly. However, when we received a CERTS cell from [::1]:5003 we actually ignored its identity digest because the learned_router_identity() function was using get_configured_bridge_by_addr_port_digest() which was returning the 127.0.0.1 bridge instead of the [::1] bridge (because it prioritizes digest matching over addrport matching). The fix replaces get_configured_bridge_by_addr_port_digest() with the recent get_configured_bridge_by_exact_addr_port_digest() function. It also relaxes the constraints of the get_configured_bridge_by_exact_addr_port_digest() function by making it return bridges whose identity digest is not yet known. By using the _exact_() function, learned_router_identity() actually fills in the identity digest of the [::1] bridge, which then allows guard_has_descriptor() to find the right node_t and verify that the descriptor is there. FWIW, in the bridges+ipv6-min test both 127.0.0.1 and [::1] bridges correspond to the same node_t, which I guess makes sense given that it's actually the same underlying bridge. --- src/or/bridges.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/bridges.c b/src/or/bridges.c index f766931..88154c6 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -218,7 +218,7 @@ get_configured_bridge_by_exact_addr_port_digest(const tor_addr_t *addr, if (digest && tor_memeq(bridge->identity, digest, DIGEST_LEN)) return bridge; - else if (!digest) + else if (!digest || tor_digest_is_zero(bridge->identity)) return bridge; } @@ -297,7 +297,7 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port, (void)ed_id; int learned = 0; bridge_info_t *bridge = - get_configured_bridge_by_addr_port_digest(addr, port, digest); + get_configured_bridge_by_exact_addr_port_digest(addr, port, digest); if (bridge && tor_digest_is_zero(bridge->identity)) { memcpy(bridge->identity, digest, DIGEST_LEN); learned = 1;

1 0

[tor/master] Merge branch 'bug21415_testfix_030'
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 118d7018d07ebc6324e8b7220002465479b0cbf3 Merge: 85782e1 6cab0f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 9 09:25:19 2017 -0500 Merge branch 'bug21415_testfix_030' src/or/bridges.c | 4 ++-- src/or/entrynodes.c | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 25c28bc2d920ffa0fe36c2de7833735255582c3a Merge: b5526be ecc73c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:11:05 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 2cfecec9c7959185877777fa853bba606c05e513 Merge: f93bcab 25c28bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:11:23 2017 -0500 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit ecc73c3c035abe1a2c33e924e37e55064e712d56 Merge: 57e778f 933a1e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:10:44 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit ded2c8c6894e6de2784e60d0d9cafec911fc9b9b Merge: 552bc39 d642ceb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:12:27 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 933a1e79975226c357d9d7f32be479a4868bb8d7 Merge: 884b371 4488c31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:10:29 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit d642ceb8dff5e837bc0e27f9f50812beece06401 Merge: 7549259 2cfecec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:12:06 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 09 Mar '17

09 Mar '17

commit 2cfecec9c7959185877777fa853bba606c05e513 Merge: f93bcab 25c28bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 8 10:11:23 2017 -0500 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)

1 0