diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-10-13 05:27:59 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-10-13 05:27:59 +0000 |
| commit | 78043b847822d122e38942b2fe71e0840235a169 (patch) | |
| tree | 626f3c10c95da9428bcf8be636b5e19afc28bccd /src/or/control.c | |
| parent | ff487020aba23c17845a57f4f8ad1c4a72b9a1f2 (diff) | |
| download | tor-78043b847822d122e38942b2fe71e0840235a169.tar tor-78043b847822d122e38942b2fe71e0840235a169.tar.gz | |
r9017@totoro: nickm | 2006-10-13 01:27:33 -0400
Second patch to work on circuit close reasons from Mike Perry. Disabled partially; see comment. Whitespace cleaned up.
svn:r8699
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index a9f0c364f..66477018f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2370,7 +2370,7 @@ handle_control_closecircuit(control_connection_t *conn, uint32_t len, } if (!safe || !circ->p_streams) { - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_NONE); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_REQUESTED); } send_control_done(conn); @@ -2990,7 +2990,7 @@ orconn_target_get_name(int long_names, name[0] = '$'; base16_encode(name+1, len-1, conn->identity_digest, DIGEST_LEN); - } else { + } else { tor_snprintf(name, len, "%s:%d", conn->_base.address, conn->_base.port); } |