tor-commits November 2017

tor-commits@lists.torproject.org

16 participants
2019 discussions

[tor/master] Merge remote-tracking branch 'dgoulet/ticket24134_032_01' into maint-0.3.2
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit 61330f40a50e304b7d7f386ab86a27292a4aa543 Merge: 31a907881 ac79f831e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 13:26:46 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket24134_032_01' into maint-0.3.2 README | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit 90fb57ec18c6c19df736097c6f56a00f00951571 Merge: d1a1d95c4 61330f40a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 13:26:50 2017 -0500 Merge branch 'maint-0.3.2' README | 3 +++ src/or/dirvote.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] doc: Put the release timeline link in README
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit ac79f831e1dd465089dc7f8fffdaed6cfdd65c98 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 8 10:44:00 2017 -0500 doc: Put the release timeline link in README Closes #24134 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README b/README index d246a6930..9e0f4b824 100644 --- a/README +++ b/README @@ -27,3 +27,6 @@ Frequently Asked Questions: To get started working on Tor development: See the doc/HACKING directory. + +Release timeline: + https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/CoreTor…

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit c99fec4999a31a56cd6a6cf573c589c5cd690830 Merge: d37bc7287 61330f40a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 13:26:50 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 README | 3 +++ src/or/dirvote.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] downgrade severity for get_voting_schedule()
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit 31a907881e2669641f8665452d50ca461dbde2d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 11:50:57 2017 -0500 downgrade severity for get_voting_schedule() --- src/or/dirvote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 33e5ea7d5..f2194ed6e 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2878,7 +2878,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now) voting_schedule_t *new_voting_schedule; /* get the new voting schedule */ - new_voting_schedule = get_voting_schedule(options, now, LOG_NOTICE); + new_voting_schedule = get_voting_schedule(options, now, LOG_INFO); tor_assert(new_voting_schedule); /* Fill in the global static struct now */

1 0

[tor/release-0.3.2] fold new entries into changelog
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit d37bc728732cd0062669b5f0abc44fc0e1c6ef3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 8 11:05:03 2017 -0500 fold new entries into changelog --- ChangeLog | 19 +++++++++++++++++++ changes/bug23318 | 11 ----------- changes/bug23751 | 6 ------ changes/bug24170 | 3 --- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e796dd04..6d92f0adb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,12 @@ Changes in version 0.3.2.4-alpha - 2017-11-08 and to Moritz, Arthur Edelstein and Roger for helping to track it down and analyze it. + o Major bugfixes (scheduler, channel): + - Ignore channels that have been closed while flushing cells. This + can happen if the write on the connection fails leading to the + channel being closed while in the scheduler loop. Fixes bug 23751; + bugfix on 0.3.2.1-alpha. + o Minor features (logging, scheduler): - Introduce a SCHED_BUG() function to log extra information about the scheduler state if we ever catch a bug in the scheduler. @@ -65,6 +71,19 @@ Changes in version 0.3.2.4-alpha - 2017-11-08 - Properly retry HSv3 descriptor fetches when missing required directory information. Fixes bug 23762; bugfix on 0.3.2.1-alpha. + o Minor bugfixes (path selection): + - When selecting relays by bandwidth, avoid a rounding error that + could sometimes cause load to be imbalanced incorrectly. + Previously, we would always round upwards; now, we round towards + the nearest integer. This had the biggest effect when a relay's + weight adjustments should have given it weight 0, but it got + weight 1 instead. Fixes bug 23318; bugfix on 0.2.4.3-alpha. + - When calculating the fraction of nodes that have descriptors, and + all all nodes in the network have zero bandwidths, count the + number of nodes instead. Fixes bug 23318; bugfix on 0.2.4.10-alpha. + - Actually log the total bandwidth in compute_weighted_bandwidths(). + Fixes bug 24170; bugfix on 0.2.4.3-alpha. + o Minor bugfixes (relay, crash): - Avoid a crash when transitioning from client mode to bridge mode. Previously, we would launch the worker threads whenever our diff --git a/changes/bug23318 b/changes/bug23318 deleted file mode 100644 index 7fcb8d448..000000000 --- a/changes/bug23318 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes (path selection): - - When selecting relays by bandwidth, avoid a rounding error that - could sometimes cause load to be imbalanced incorrectly. Previously, - we would always round upwards; now, we round towards the nearest - integer. This had the biggest effect when a relay's weight adjustments - should have given it weight 0, but it got weight 1 instead. - Fixes bug 23318; bugfix on 0.2.4.3-alpha. - - When calculating the fraction of nodes that have descriptors, and all - all nodes in the network have zero bandwidths, count the number of nodes - instead. - Fixes bug 23318; bugfix on 0.2.4.10-alpha. diff --git a/changes/bug23751 b/changes/bug23751 deleted file mode 100644 index 2fd702166..000000000 --- a/changes/bug23751 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (scheduler, channel): - - Ignore channels that have been closed while flushing cells. This can - happen if the write on the connection fails leading to the channel being - closed while in the scheduler loop. This is not a complete fix, it is a - bandaid until we are able to refactor those interactions. Fixes bug - 23751; bugfix on 0.3.2.1-alpha. diff --git a/changes/bug24170 b/changes/bug24170 deleted file mode 100644 index d3d734769..000000000 --- a/changes/bug24170 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (path selection): - - Actually log the total bandwidth in compute_weighted_bandwidths(). - Fixes bug 24170; bugfix on 0.2.4.3-alpha.

1 0

[nyx/master] Add FreeBSD back to download page
by atagar＠torproject.org 08 Nov '17

08 Nov '17

commit ddf06635a9a1b1813cc498260159e75e6a62f34e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 8 09:58:08 2017 -0800 Add FreeBSD back to download page Thanks to Carlo we now have a FreeBSD port of nyx! \o/ --- web/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/index.html b/web/index.html index 811e9e4..df517e6 100644 --- a/web/index.html +++ b/web/index.html @@ -386,14 +386,14 @@ sudo python setup.py install</pre><br></li> <a href="https://slackbuilds.org/repository/13.37/network/arm/" class="platform-title">Slackware</a> <p>Package maintained by pyllyukko for <a href="http://slackbuilds.org/howto/">Slackware</a>.</p> </div> + --> <div class="platform"> - <a href="http://www.freshports.org/security/arm" id="freebsd"><img src="images/download/freebsd.png" alt="FreeBSD"></a> - <a href="http://www.freshports.org/security/arm" class="platform-title">FreeBSD</a> + <a href="https://www.freshports.org/security/nyx/" id="freebsd"><img src="images/download/freebsd.png" alt="FreeBSD"></a> + <a href="https://www.freshports.org/security/nyx/" class="platform-title">FreeBSD</a> <p>Port maintained by Carlo for <a href="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports.html">FreeBSD</a>.</p> - <pre>% pkg install security/arm</pre> + <pre>% pkg install security/nyx</pre> </div> - --> <div class="platform"> <a href="https://gitweb.torproject.org/nyx.git" id="git"><img src="images/download/git.png" alt="Git"></a>

1 0

[tor/maint-0.3.2] downgrade severity for get_voting_schedule()
by nickm＠torproject.org 08 Nov '17

08 Nov '17

1 0

[tor/maint-0.3.2] Remove an erroneous 0.5 in compute_weighted_bandwidths()
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit 3c03e237ab372f495fa2498e925813931ba381da Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 15:29:15 2017 -0400 Remove an erroneous 0.5 in compute_weighted_bandwidths() Back in 0.2.4.3-alpha (e106812a778f537), when we switched from using double to using uint64 for selecting by bandwidth, I got the math wrong: I should have used llround(x), or (uint64_t)(x+0.5), but instead I wrote llround(x+0.5). That means we would always round up, rather than rounding to the closest integer Fixes bug 23318; bugfix on 0.2.4.3-alpha. --- changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug23318 b/changes/bug23318 new file mode 100644 index 000000000..32c85eb19 --- /dev/null +++ b/changes/bug23318 @@ -0,0 +1,7 @@ + o Minor bugfixes (path selection): + - When selecting relays by bandwidth, avoid a rounding error that + could sometimes cause load to be imbalanced incorrectly. Previously, + we would always round upwards; now, we round towards the nearest + integer. This had the biggest effect when a relay's weight adjustments + should have given it weight 0, but it got weight 1 instead. + Fixes bug 23318; bugfix on 0.2.4.3-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2365f28fd..faf2eeda5 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2713,7 +2713,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, final_weight = weight*this_bw; } - bandwidths[node_sl_idx] = final_weight + 0.5; + bandwidths[node_sl_idx] = final_weight; } SMARTLIST_FOREACH_END(node); log_debug(LD_CIRC, "Generated weighted bandwidths for rule %s based "

1 0

[tor/maint-0.3.2] sched: Ignore closed channel after flushing cells
by nickm＠torproject.org 08 Nov '17

08 Nov '17

commit dcabf801e52a83e2c3cc23ccc1fa906582a927d6 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 8 09:44:39 2017 -0500 sched: Ignore closed channel after flushing cells The flush cells process can close a channel if the connection write fails but still return that it flushed at least one cell. This is due because the error is not propagated up the call stack so there is no way of knowing if the flush actually was successful or not. Because this would require an important refactoring touching multiple subsystems, this patch is a bandaid to avoid the KIST scheduler to handle closed channel in its loop. Bandaid on #23751. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23751 | 6 ++++++ src/or/scheduler_kist.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/bug23751 b/changes/bug23751 new file mode 100644 index 000000000..2fd702166 --- /dev/null +++ b/changes/bug23751 @@ -0,0 +1,6 @@ + o Minor bugfixes (scheduler, channel): + - Ignore channels that have been closed while flushing cells. This can + happen if the write on the connection fails leading to the channel being + closed while in the scheduler loop. This is not a complete fix, it is a + bandaid until we are able to refactor those interactions. Fixes bug + 23751; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index a3b74e8cc..d1726ba34 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -598,6 +598,15 @@ kist_scheduler_run(void) if (socket_can_write(&socket_table, chan)) { /* flush to channel queue/outbuf */ flush_result = (int)channel_flush_some_cells(chan, 1); // 1 for num cells + /* XXX: While flushing cells, it is possible that the connection write + * fails leading to the channel to be closed which triggers a release + * and free its entry in the socket table. And because of a engineering + * design issue, the error is not propagated back so we don't get an + * error at this poin. So before we continue, make sure the channel is + * open and if not just ignore it. See #23751. */ + if (!CHANNEL_IS_OPEN(chan)) { + continue; + } /* flush_result has the # cells flushed */ if (flush_result > 0) { update_socket_written(&socket_table, chan, flush_result *

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2017