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

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a Merge: 2ea573ece eecfed0cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit cdee62da9e06dfc91a3100248bd9b8e82345347f Merge: 04524443d da38904ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 1723138fcd48adc6b50f56d013352a2915f84ce2 Merge: bda3c5444 31ce03a2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 4593f5a6e12132be4ac97d7a93675d1a04fa4b29 Merge: 43fb8fc5c cdee62da9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/release-0.3.2] rename changes file
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit d3b7a2bd275842e9826946428d25fc5b72153f7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:05 2017 -0500 rename changes file --- changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/bug23682 b/changes/bug23862 similarity index 100% rename from changes/bug23682 rename to changes/bug23862

1 0

[tor/release-0.3.2] Merge branch 'bug24167_025' into maint-0.2.5
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

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

12 Dec '17

commit 58f974818c6fc9452bbdbe78d82ed10bdcbbae7e Merge: 2cfb7b041 4593f5a6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.2.9] Fix a traceback when closing a blocked connection "immediately".
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events immediately. But if it had been blocked on bandwidth read/write, we could try to re-add its (nonexistent) events later from connection_bucket_refill -- if we got to that callback before we swept the marked connections. Fixes bug 24167. Fortunately, this hasn't been a crash bug since we introduced connection_check_event in 0.2.9.10, and backported it. This is a bugfix on commit 89d422914a0c3cb, I believe, which appeared in Tor 0.1.0.1-rc. --- changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug24167 b/changes/bug24167 new file mode 100644 index 000000000..fd0d87eff --- /dev/null +++ b/changes/bug24167 @@ -0,0 +1,7 @@ + o Minor bugfixes (network layer): + - When closing a connection via close_connection_immediately(), we + mark it as "not blocked on bandwidth", to prevent later calls + from trying to unblock it, and give it permission to read. This + fixes a backtrace warning that can happen on relays under various + circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc. + diff --git a/src/or/connection.c b/src/or/connection.c index 276dca281..61f4f5aa6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -721,6 +721,10 @@ connection_close_immediate(connection_t *conn) connection_unregister_events(conn); + /* Prevent the event from getting unblocked. */ + conn->read_blocked_on_bw = + conn->write_blocked_on_bw = 0; + if (SOCKET_OK(conn->s)) tor_close_socket(conn->s); conn->s = TOR_INVALID_SOCKET;

1 0