diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-17 08:35:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-17 08:35:52 -0500 |
| commit | 3a364309ace5bc0b75b724484d6b27d84ec6a8b1 (patch) | |
| tree | 1400c003f4c8ff66941b78fdac2335fc39ca9554 | |
| parent | 0571015819317f6b52416d8023a99ee5a8f31dee (diff) | |
| parent | 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 (diff) | |
| download | tor-3a364309ace5bc0b75b724484d6b27d84ec6a8b1.tar.gz tor-3a364309ace5bc0b75b724484d6b27d84ec6a8b1.zip | |
Merge branch 'bug24167_025' into maint-0.3.2
| -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 632a833652..d2cf4fb416 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -770,6 +770,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; |