aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
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/circuitbuild.c
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/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 354a9767e1..69ace8838e 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -99,7 +99,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn)
return 0;
}
test_circ_id |= high_bit;
- } while (circuit_get_by_circid_orconn(test_circ_id, conn));
+ } while (circuit_id_in_use_on_orconn(test_circ_id, conn));
return test_circ_id;
}