diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-04-10 19:30:41 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-04-12 01:11:31 -0400 |
commit | 39ac1db60e8b920e1e6b07e08f7f3343960ece79 (patch) | |
tree | 9d934519662d30f52baaa84d844236910ffc8170 /src/or/or.h | |
parent | 9630fb917f3549b3fcbd4a3885e0c47f4be9be36 (diff) | |
download | tor-39ac1db60e8b920e1e6b07e08f7f3343960ece79.tar.gz tor-39ac1db60e8b920e1e6b07e08f7f3343960ece79.zip |
Avoid busy-looping on WANTREAD within connection_handle_write
Fix for bug 5650. Also, if we get a WANTREAD while reading while
writing, make sure we're reading.
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 51c23d305d..6728b862b5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -998,6 +998,9 @@ typedef struct connection_t { /** Set to 1 when we're inside connection_flushed_some to keep us from * calling connection_handle_write() recursively. */ unsigned int in_flushed_some:1; + /** True if connection_handle_write is currently running on this connection. + */ + unsigned int in_connection_handle_write:1; /* For linked connections: */ |