diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-02-03 14:57:47 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-02-03 14:57:47 +0000 |
| commit | 6149ab01f86ddc406b2232292d693a1702122c89 (patch) | |
| tree | 718e0c46eda091570867c2383acdc41d3baac5c9 /src/or/connection.c | |
| parent | 275109d8b011e4ddd61e559f7b9dc66045dc885b (diff) | |
| download | tor-6149ab01f86ddc406b2232292d693a1702122c89.tar.gz tor-6149ab01f86ddc406b2232292d693a1702122c89.zip | |
r12129@Kushana: nickm | 2007-02-03 09:57:36 -0500
Update assert_connection_ok() to match the "block tunnelled dir conn if the or conn is full" logic. This may fix bug 385.
svn:r9479
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 31e758b278..8dcee806e0 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2377,7 +2377,9 @@ assert_connection_ok(connection_t *conn, time_t now) } if (conn->outbuf_flushlen > 0) { - tor_assert(connection_is_writing(conn) || conn->wants_to_write); + tor_assert(connection_is_writing(conn) || conn->wants_to_write || + (conn->type == CONN_TYPE_DIR && + TO_DIR_CONN(conn)->is_blocked_on_or_conn)); } if (conn->hold_open_until_flushed) |