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

[tor/maint-0.3.0] Improve descriptor checks in the new guard algorithm.
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 18a98206ede334c7332c43dc9f0b812611273f37 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 1 12:38:12 2017 +0200 Improve descriptor checks in the new guard algorithm. - Make sure we check at least two guards for descriptor before making circuits. We typically use the first primary guard for circuits, but it can also happen that we use the second primary guard (e.g. if we pick our first primary guard as an exit), so we should make sure we have descriptors for both of them. - Remove BUG() from the guard_has_descriptor() check since we now know that this can happen in rare but legitimate situations as well, and we should just move to the next guard in that case. --- changes/bug21415 | 4 ++++ src/or/entrynodes.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug21415 b/changes/bug21415 new file mode 100644 index 0000000..f0aa72f --- /dev/null +++ b/changes/bug21415 @@ -0,0 +1,4 @@ + o Minor bugfix (entry guards): + - Silence a BUG() warning when attempting to use a guard whose descriptor + we don't know and make this scenario more unlikely to happen. Fixes bug + 21415; bugfix on 0.3.0.1-alpha. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3e87147..729e4b0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1843,7 +1843,7 @@ select_entry_guard_for_circuit(guard_selection_t *gs, if (! entry_guard_obeys_restriction(guard, rst)) continue; if (guard->is_reachable != GUARD_REACHABLE_NO) { - if (need_descriptor && BUG(!guard_has_descriptor(guard))) { + if (need_descriptor && !guard_has_descriptor(guard)) { continue; } *state_out = GUARD_CIRC_STATE_USABLE_ON_COMPLETION; @@ -3357,9 +3357,15 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); - const int num_primary = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); int n_missing_descriptors = 0; int n_considered = 0; + int num_primary_to_check; + + /* We want to check for the descriptor of at least the first two primary + * 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); + num_primary_to_check++; SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard); @@ -3368,7 +3374,7 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) n_considered++; if (!guard_has_descriptor(guard)) n_missing_descriptors++; - if (n_considered >= num_primary) + if (n_considered >= num_primary_to_check) break; } SMARTLIST_FOREACH_END(guard);

1 0

[tor/release-0.3.0] Improve descriptor checks in the new guard algorithm.
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 18a98206ede334c7332c43dc9f0b812611273f37 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 1 12:38:12 2017 +0200 Improve descriptor checks in the new guard algorithm. - Make sure we check at least two guards for descriptor before making circuits. We typically use the first primary guard for circuits, but it can also happen that we use the second primary guard (e.g. if we pick our first primary guard as an exit), so we should make sure we have descriptors for both of them. - Remove BUG() from the guard_has_descriptor() check since we now know that this can happen in rare but legitimate situations as well, and we should just move to the next guard in that case. --- changes/bug21415 | 4 ++++ src/or/entrynodes.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug21415 b/changes/bug21415 new file mode 100644 index 0000000..f0aa72f --- /dev/null +++ b/changes/bug21415 @@ -0,0 +1,4 @@ + o Minor bugfix (entry guards): + - Silence a BUG() warning when attempting to use a guard whose descriptor + we don't know and make this scenario more unlikely to happen. Fixes bug + 21415; bugfix on 0.3.0.1-alpha. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3e87147..729e4b0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1843,7 +1843,7 @@ select_entry_guard_for_circuit(guard_selection_t *gs, if (! entry_guard_obeys_restriction(guard, rst)) continue; if (guard->is_reachable != GUARD_REACHABLE_NO) { - if (need_descriptor && BUG(!guard_has_descriptor(guard))) { + if (need_descriptor && !guard_has_descriptor(guard)) { continue; } *state_out = GUARD_CIRC_STATE_USABLE_ON_COMPLETION; @@ -3357,9 +3357,15 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) if (!gs->primary_guards_up_to_date) entry_guards_update_primary(gs); - const int num_primary = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC); int n_missing_descriptors = 0; int n_considered = 0; + int num_primary_to_check; + + /* We want to check for the descriptor of at least the first two primary + * 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); + num_primary_to_check++; SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard); @@ -3368,7 +3374,7 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs) n_considered++; if (!guard_has_descriptor(guard)) n_missing_descriptors++; - if (n_considered >= num_primary) + if (n_considered >= num_primary_to_check) break; } SMARTLIST_FOREACH_END(guard);

1 0

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

01 Mar '17

commit d8fa6f9ddb74ced0b51a39608526eba0fc21135a Merge: fa6b426 18a9820 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:54:58 2017 -0500 Merge branch 'maint-0.3.0' changes/bug21415 | 4 ++++ src/or/entrynodes.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

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

01 Mar '17

commit 26997ef9ae4591c06f5916fdfdd216d01333e878 Merge: 23d365f 18a9820 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:51:10 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21415 | 4 ++++ src/or/entrynodes.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

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

01 Mar '17

commit 5ff31ff5b34fd69383b366d38e997822f0442086 Merge: f2ca22f 7549259 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:19:23 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 "Ours" merge to avoid version bump

1 0

[tor/maint-0.3.0] Bump to 0.2.9.10-dev
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 75492598b2fa595c25c41212d3b2714e59efdcc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:18:54 2017 -0500 Bump to 0.2.9.10-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 095f374..d54793a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.10]) +AC_INIT([tor],[0.2.9.10-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 987aa01..5f3ac99 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.10" +!define VERSION "0.2.9.10-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 540cfab..a54c009 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.10" +#define VERSION "0.2.9.10-dev"

1 0

[tor/maint-0.2.9] Bump to 0.2.9.10-dev
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 75492598b2fa595c25c41212d3b2714e59efdcc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:18:54 2017 -0500 Bump to 0.2.9.10-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 095f374..d54793a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.10]) +AC_INIT([tor],[0.2.9.10-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 987aa01..5f3ac99 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.10" +!define VERSION "0.2.9.10-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 540cfab..a54c009 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.10" +#define VERSION "0.2.9.10-dev"

1 0

[tor/master] Bump to 0.2.9.10-dev
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 75492598b2fa595c25c41212d3b2714e59efdcc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:18:54 2017 -0500 Bump to 0.2.9.10-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 095f374..d54793a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.10]) +AC_INIT([tor],[0.2.9.10-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 987aa01..5f3ac99 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.10" +!define VERSION "0.2.9.10-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 540cfab..a54c009 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.10" +#define VERSION "0.2.9.10-dev"

1 0

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

01 Mar '17

commit 5ff31ff5b34fd69383b366d38e997822f0442086 Merge: f2ca22f 7549259 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:19:23 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 "Ours" merge to avoid version bump

1 0

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

01 Mar '17

commit fa6b42699937f12c7a814edcff4ef8e17db086db Merge: 16bddc3 5ff31ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 1 08:19:45 2017 -0500 Merge branch 'maint-0.3.0'

1 0