diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:56:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:56:31 -0500 |
| commit | beeeeb0afa7ba6f1af0e64afbed13376855ea88d (patch) | |
| tree | a45fab191cd82a137c3105337fae86923b0c2d42 | |
| parent | ca19b2115a761ec37a6af56f6672cc0e16658929 (diff) | |
| parent | 1deda2106b0af16daaecc2e27982a28054e28345 (diff) | |
| download | tor-beeeeb0afa7ba6f1af0e64afbed13376855ea88d.tar.gz tor-beeeeb0afa7ba6f1af0e64afbed13376855ea88d.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
| -rw-r--r-- | changes/bug24167 | 7 | ||||
| -rw-r--r-- | src/or/connection.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug24167 b/changes/bug24167 new file mode 100644 index 0000000000..fd0d87efff --- /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 276dca2818..61f4f5aa69 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; |