diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-03-23 02:52:55 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-03-23 02:52:55 +0000 |
| commit | 7373042a7b5349bd45b3ce7c6b99a694330a65ad (patch) | |
| tree | c47b37426c26c9ddbc5c6d5e38171b7a9a8c5ea0 /src/or/connection.c | |
| parent | a523439cbc131facdcde10f6c25edb1a8f995724 (diff) | |
| download | tor-7373042a7b5349bd45b3ce7c6b99a694330a65ad.tar.gz tor-7373042a7b5349bd45b3ce7c6b99a694330a65ad.zip | |
fix assert triggers (bugs 109 and 96), and put in some
debugging logs to notice future repeat bugs.
svn:r3826
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 1f09bc43a9..bc8864aba4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1616,8 +1616,10 @@ void assert_connection_ok(connection_t *conn, time_t now) tor_assert(conn->socks_request); if (conn->state == AP_CONN_STATE_OPEN) { tor_assert(conn->socks_request->has_finished); - tor_assert(conn->cpath_layer); - assert_cpath_layer_ok(conn->cpath_layer); + if (!conn->marked_for_close) { + tor_assert(conn->cpath_layer); + assert_cpath_layer_ok(conn->cpath_layer); + } } } else { tor_assert(!conn->socks_request); |