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/circuituse.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/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 5f45292859..d7fcf907aa 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1255,11 +1255,13 @@ connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn, /** Try to find a safe live circuit for CONN_TYPE_AP connection conn. If * we don't find one: if conn cannot be handled by any known nodes, - * warn and return -1 (conn needs to die); + * warn and return -1 (conn needs to die, and is maybe already marked); * else launch new circuit (if necessary) and return 0. * Otherwise, associate conn with a safe live circuit, do the * right next step, and return 1. */ +/* XXXX021 this function should mark for close whenever it returns -1; + * its callers shouldn't have to worry about that. */ int connection_ap_handshake_attach_circuit(edge_connection_t *conn) { |