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

avoid shadowing a variable so we don't get sad later.

Browse Source 
svn:r6133
This commit is contained in:
Roger Dingledine 2006-03-12 04:07:21 +00:00
parent ef8939d5b3
commit 80f0492a65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/control.c
View File

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