diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-01-06 03:16:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-01-06 03:16:11 +0000 |
| commit | d73b7919693037024f5acd2cbea8b3125ccc7fb9 (patch) | |
| tree | a9bab03ea6ee718437e5ec129713df2352723f4d /src/or/connection_or.c | |
| parent | 6d58d80e78d9b6706bda502a9041351f4a619306 (diff) | |
| download | tor-d73b7919693037024f5acd2cbea8b3125ccc7fb9.tar.gz tor-d73b7919693037024f5acd2cbea8b3125ccc7fb9.zip | |
r17473@catbus: nickm | 2008-01-05 22:15:05 -0500
Add a reverse mapping from SSL to tor_tls_t*: we need this in order to do a couple of things the sensible way from inside callbacks. Also, add a couple of missing cases in connection_or.c
svn:r13040
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e9d9a877d0..fc5373c927 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -261,6 +261,7 @@ connection_or_process_inbuf(or_connection_t *conn) case OR_CONN_STATE_PROXY_READING: return connection_or_read_proxy_response(conn); case OR_CONN_STATE_OPEN: + case OR_CONN_STATE_OR_HANDSHAKING: return connection_or_process_cells_from_inbuf(conn); default: return 0; /* don't do anything */ @@ -315,6 +316,7 @@ connection_or_finished_flushing(or_connection_t *conn) connection_stop_writing(TO_CONN(conn)); break; case OR_CONN_STATE_OPEN: + case OR_CONN_STATE_OR_HANDSHAKING: connection_stop_writing(TO_CONN(conn)); break; default: |