diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-17 03:37:54 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-17 03:37:54 +0000 |
| commit | c59f66709d024dfb112d1f648b14aeec057e1308 (patch) | |
| tree | ba181299380d544fb82b5bf00c1d535e56132864 /src/or/relay.c | |
| parent | bd547e3cfc5608cbab9c571a5d05d7de838dba77 (diff) | |
| download | tor-c59f66709d024dfb112d1f648b14aeec057e1308.tar.gz tor-c59f66709d024dfb112d1f648b14aeec057e1308.zip | |
r18862@catbus: nickm | 2008-03-16 23:33:11 -0400
Part of fix for bug 617: allow connection_ap_handshake_attach_circuit() to mark connections, to avoid double-mark warnings. Note that this is an incomplete refactoring.
svn:r14066
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 4bbb0b5b71..0d863cd972 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -845,7 +845,9 @@ connection_edge_process_end_not_open( connection_edge_end_reason_str(rh->length > 0 ? reason : -1)); if (conn->_base.type == CONN_TYPE_AP) { circuit_log_path(LOG_INFO,LD_APP,circ); - connection_mark_unattached_ap(conn, control_reason); + /* need to test because of detach_retriable*/ + if (!conn->_base.marked_for_close) + connection_mark_unattached_ap(conn, control_reason); } else { /* we just got an 'end', don't need to send one */ conn->_base.edge_has_sent_end = 1; |