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

[tor/maint-0.3.1] Stop calculating total twice in frac_nodes_with_descriptors()
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 6e4ebd41bb5479ffe05ed173a1d7aeffcf592248 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 8 14:18:46 2017 +1100 Stop calculating total twice in frac_nodes_with_descriptors() Cleanup after 23318. --- src/or/routerlist.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c9d2cbaea..8f53c0200 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2768,12 +2768,10 @@ frac_nodes_with_descriptors(const smartlist_t *sl, return ((double)n_with_descs) / (double)smartlist_len(sl); } - total = present = 0.0; + present = 0.0; SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { - const double bw = bandwidths[node_sl_idx]; - total += bw; if (node_has_descriptor(node)) - present += bw; + present += bandwidths[node_sl_idx]; } SMARTLIST_FOREACH_END(node); tor_free(bandwidths);

1 0

[tor/maint-0.3.1] Check arguments and initialise variables in compute_weighted_bandwidths()
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 4f944cc4cc1971baf2924bc3f713feef7b010691 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 8 14:17:37 2017 +1100 Check arguments and initialise variables in compute_weighted_bandwidths() Cleanup after 23318. --- src/or/routerlist.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 80486cccb..c9d2cbaea 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2547,9 +2547,12 @@ compute_weighted_bandwidths(const smartlist_t *sl, double Wg = -1, Wm = -1, We = -1, Wd = -1; double Wgb = -1, Wmb = -1, Web = -1, Wdb = -1; guardfraction_bandwidth_t guardfraction_bw; - double *bandwidths; + double *bandwidths = NULL; double total_bandwidth = 0.0; + tor_assert(sl); + tor_assert(bandwidths_out); + /* Can't choose exit and guard at same time */ tor_assert(rule == NO_WEIGHTING || rule == WEIGHT_FOR_EXIT || @@ -2557,6 +2560,8 @@ compute_weighted_bandwidths(const smartlist_t *sl, rule == WEIGHT_FOR_MID || rule == WEIGHT_FOR_DIR); + *bandwidths_out = NULL; + if (total_bandwidth_out) { *total_bandwidth_out = 0.0; }

1 0

[tor/maint-0.3.2] Merge branch 'bug23318-redux_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit e91bae66d88a863970658174f8734b303042a161 Merge: 84c13336c 6e4ebd41b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:03 2018 -0500 Merge branch 'bug23318-redux_029' into maint-0.2.9 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'bug23318-redux_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit e91bae66d88a863970658174f8734b303042a161 Merge: 84c13336c 6e4ebd41b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:03 2018 -0500 Merge branch 'bug23318-redux_029' into maint-0.2.9 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 91109bc813211516e34f25fc4418211488a8ab57 Merge: b2c4d4e7f e91bae66d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 91109bc813211516e34f25fc4418211488a8ab57 Merge: b2c4d4e7f e91bae66d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 91109bc813211516e34f25fc4418211488a8ab57 Merge: b2c4d4e7f e91bae66d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/master] Merge branch 'bug23318-redux_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit e91bae66d88a863970658174f8734b303042a161 Merge: 84c13336c 6e4ebd41b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:03 2018 -0500 Merge branch 'bug23318-redux_029' into maint-0.2.9 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 021c3bd5879f1f3d25823a63c86b159dfb29a434 Merge: 98fc8cd93 91109bc81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 021c3bd5879f1f3d25823a63c86b159dfb29a434 Merge: 98fc8cd93 91109bc81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0