nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix assert while attachstream'ing a connect-wait or

Browse Source 
resolve-wait stream.


svn:r6134
This commit is contained in:
Roger Dingledine 2006-03-12 04:33:29 +00:00
parent 80f0492a65
commit b5c6a990d3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/control.c
View File

@ -1831,13 +1831,13 @@ handle_control_attachstream(connection_t *conn, uint32_t len,
/* Do we need to detach it first? */ /* Do we need to detach it first? */
if (ap_conn->state != AP_CONN_STATE_CONTROLLER_WAIT) { if (ap_conn->state != AP_CONN_STATE_CONTROLLER_WAIT) {
circuit_t *tmpcirc = circuit_get_by_edge_conn(conn); circuit_t *tmpcirc = circuit_get_by_edge_conn(ap_conn);
connection_edge_end(conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer); connection_edge_end(ap_conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer);
/* Un-mark it as ending, since we're going to reuse it. */ /* Un-mark it as ending, since we're going to reuse it. */
conn->has_sent_end = 0; ap_conn->has_sent_end = 0;
if (tmpcirc) if (tmpcirc)
circuit_detach_stream(tmpcirc,conn); circuit_detach_stream(tmpcirc,ap_conn);
conn->state = AP_CONN_STATE_CONTROLLER_WAIT; ap_conn->state = AP_CONN_STATE_CONTROLLER_WAIT;
} }
if (zero_circ) { if (zero_circ) {