summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-07-23 12:55:55 +0000
committerNick Mathewson <nickm@torproject.org>2008-07-23 12:55:55 +0000
commit087094961b0ba75435fe5bdfab0788b0e3b5293c (patch)
tree59e0bfe483f988021b0e5c222740d7b67ea5e09d /src/or/or.h
parent29795999a0ea917d2f3438b1e8c6debe7b04df80 (diff)
downloadtor-087094961b0ba75435fe5bdfab0788b0e3b5293c.tar.gz
tor-087094961b0ba75435fe5bdfab0788b0e3b5293c.zip
r17302@aud-055: nickm | 2008-07-23 14:55:28 +0200
Never allow a circuit to be created with the same circid as a circuit that has been marked for close. May be a fix for bug 779. Needs testing. Backport candidate. svn:r16136
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index b81db6f7af..ffcb686cbe 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2623,6 +2623,7 @@ origin_circuit_t *origin_circuit_new(void);
or_circuit_t *or_circuit_new(uint16_t p_circ_id, or_connection_t *p_conn);
circuit_t *circuit_get_by_circid_orconn(uint16_t circ_id,
or_connection_t *conn);
+int circuit_id_in_use_on_orconn(uint16_t circ_id, or_connection_t *conn);
circuit_t *circuit_get_by_edge_conn(edge_connection_t *conn);
void circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason);
origin_circuit_t *circuit_get_by_global_id(uint32_t id);