diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-03-24 15:57:51 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-03-24 15:57:51 +0000 |
| commit | 306d5400c367460936523f8417102f043a98fa78 (patch) | |
| tree | 332d33d9a82fe3bf3bf8bb2be306b58c0a4bc5aa /src/or/control.c | |
| parent | 2cf63f8a62b668c2543b31519d4a8ed593a70cc7 (diff) | |
| download | tor-306d5400c367460936523f8417102f043a98fa78.tar.gz tor-306d5400c367460936523f8417102f043a98fa78.zip | |
r12643@0-41-wifi: nickm | 2007-03-23 14:56:35 -0400
Refactor a bunch of functions that take edge_connection_t not to also take a crypt_path_t; the cpath is implicit.
svn:r9899
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index b644435a4c..e8ed0acdde 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1931,8 +1931,7 @@ handle_control_attachstream(control_connection_t *conn, uint32_t len, /* Do we need to detach it first? */ if (ap_conn->_base.state != AP_CONN_STATE_CONTROLLER_WAIT) { circuit_t *tmpcirc = circuit_get_by_edge_conn(ap_conn); - connection_edge_end(ap_conn, END_STREAM_REASON_TIMEOUT, - ap_conn->cpath_layer); + connection_edge_end(ap_conn, END_STREAM_REASON_TIMEOUT); /* Un-mark it as ending, since we're going to reuse it. */ ap_conn->_base.edge_has_sent_end = 0; ap_conn->end_reason = 0; |