diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-02-03 11:37:19 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-02-03 11:37:19 +0000 |
| commit | 0fadf0aad6fc59a51418489a0171840d9ca162e6 (patch) | |
| tree | a36567b196f95eafa4c3e377e8909c4d0552960f /src/or/control.c | |
| parent | 418dc7b16eec15f5641902e7675d691feb4eb002 (diff) | |
| download | tor-0fadf0aad6fc59a51418489a0171840d9ca162e6.tar.gz tor-0fadf0aad6fc59a51418489a0171840d9ca162e6.zip | |
Fix bug 225: now "attachstream 0" treats conn like it just connected,
doing address remapping, handling .exit and .onion idioms, and so on.
Now we are more uniform in making sure that the controller hears about
all new connections, and making sure it hears when they close.
svn:r5897
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/control.c b/src/or/control.c index 3cbf09414a..0f40e4d8a3 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1744,9 +1744,7 @@ handle_control_attachstream(connection_t *conn, uint32_t len, } if (zero_circ) { - ap_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; - if (connection_ap_handshake_attach_circuit(ap_conn)<0) - connection_mark_unattached_ap(ap_conn, END_STREAM_REASON_CANT_ATTACH); + connection_ap_handshake_rewrite_and_attach(ap_conn); send_control_done(conn); return 0; } |