aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-17 14:06:10 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-17 14:06:10 -0500
commite5e50d86ca4d4cf7ec3f78dbaa989fb4b6063f25 (patch)
tree1f38f7ec82c7b60b90f12aa0d8c15744c751495a /src/or
parent37504b5efae2e1423ec09eae6fc6d1e229987e3d (diff)
downloadtor-e5e50d86ca4d4cf7ec3f78dbaa989fb4b6063f25.tar
tor-e5e50d86ca4d4cf7ec3f78dbaa989fb4b6063f25.tar.gz
Ignore all bufferevent events on a marked connection
Bug 4697; fix on 0.2.3.1-alpha
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 28d8bca12..9283c9858 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2960,6 +2960,9 @@ connection_handle_event_cb(struct bufferevent *bufev, short event, void *arg)
{
connection_t *conn = arg;
(void) bufev;
+ if (conn->marked_for_close)
+ return;
+
if (event & BEV_EVENT_CONNECTED) {
tor_assert(connection_state_is_connecting(conn));
if (connection_finished_connecting(conn)<0)