[tor-commits] [tor/master] three more cases where maybe we want to exclude

[nickm at torproject.org]

commit 5710ea64757cf0b36ab6d97409bbb9213116f949
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Mar 11 06:19:15 2011 -0500

    three more cases where maybe we want to exclude
---
 src/or/circuitbuild.c |    1 +
 src/or/router.c       |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b8a82e8..4fa87c0 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -4570,6 +4570,7 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge)
     return; /* it's already on the way */
 
   address = tor_dup_addr(&bridge->addr);
+  /* XXX022-1090 if we ExcludeNodes this bridge, should this step fail? -RD */
   directory_initiate_command(address, &bridge->addr,
                              bridge->port, 0,
                              0, /* does not matter */
diff --git a/src/or/router.c b/src/or/router.c
index c15b9b2..6993e1e 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -857,6 +857,7 @@ consider_testing_reachability(int test_or, int test_dir)
     log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.",
              !orport_reachable ? "reachability" : "bandwidth",
              me->address, me->or_port);
+    /* XXX022-1090 If we ExcludeNodes ourself, should this fail? -RD */
     circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, me,
                              CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL);
   }
@@ -867,6 +868,7 @@ consider_testing_reachability(int test_or, int test_dir)
                 CONN_TYPE_DIR, &addr, me->dir_port,
                 DIR_PURPOSE_FETCH_SERVERDESC)) {
     /* ask myself, via tor, for my server descriptor. */
+    /* XXX022-1090 If we ExcludeNodes ourself, should this fail? -RD */
     directory_initiate_command(me->address, &addr,
                                me->or_port, me->dir_port,
                                0, /* does not matter */