diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-10-17 15:20:00 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-10-17 15:20:00 +0000 |
| commit | b713b370bfdd2be8f1456d11f7e087c9cf7cdee7 (patch) | |
| tree | 2f9e2c06a9f0a042f56b06a96f66456fde68d07b /src/or/circuitlist.c | |
| parent | e3b1d059c7f17bf82cf9ac80a50642bb4db6dffe (diff) | |
| download | tor-b713b370bfdd2be8f1456d11f7e087c9cf7cdee7.tar.gz tor-b713b370bfdd2be8f1456d11f7e087c9cf7cdee7.zip | |
r9060@totoro: nickm | 2006-10-17 11:12:48 -0400
Apply patch from Mike Perry: add more reasons for circuit destroys. (Slightly tweaked to avoid allocating a number for an "internal" reason.)
svn:r8739
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 35514e3783..37b3717ff2 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -780,7 +780,7 @@ circuit_mark_all_unused_circs(void) if (CIRCUIT_IS_ORIGIN(circ) && !circ->marked_for_close && !circ->timestamp_dirty) - circuit_mark_for_close(circ, END_CIRC_REASON_REQUESTED); + circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } } @@ -843,7 +843,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, file, line, circ->purpose); } reason = END_CIRC_REASON_NONE; - } else if (CIRCUIT_IS_ORIGIN(circ) && reason != END_CIRC_REASON_NONE) { + } else if (CIRCUIT_IS_ORIGIN(circ) && reason < _END_CIRC_REASON_MIN) { /* We don't send reasons when closing circuits at the origin, but we want * to track them anyway so we can give them to the controller. */ reason = END_CIRC_REASON_NONE; |