aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-03-28 16:51:00 -0400
committerNick Mathewson <nickm@torproject.org>2011-04-26 23:54:16 -0400
commite4689d840266088739eee39e9bef84e13c988ce9 (patch)
treea5302c38f38bfc70bbae60b24f2d30d21b2b064d
parentdb2fd28308fb019e59280219cf95f09f5208092f (diff)
downloadtor-e4689d840266088739eee39e9bef84e13c988ce9.tar
tor-e4689d840266088739eee39e9bef84e13c988ce9.tar.gz
Note a slightly less likely way to violate ExcludeNodes
-rw-r--r--src/or/circuitlist.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index d11b45794..42073fb96 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -933,6 +933,11 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
"capacity %d, internal %d",
purpose, need_uptime, need_capacity, internal);
+ /* XXX022-1090 We should make sure that when we cannibalize a circuit, it
+ * contains no excluded nodes. (This is possible if StrictNodes is 0, and
+ * we thought we needed to use an excluded exit node for, say, a directory
+ * operation.) -NM */
+
for (_circ=global_circuitlist; _circ; _circ = _circ->next) {
if (CIRCUIT_IS_ORIGIN(_circ) &&
_circ->state == CIRCUIT_STATE_OPEN &&