If we're a relay, avoid picking ourselves as an introduction point,

a rendezvous point, or as the final hop for internal circuits. Bug
reported by taranis and lodger. Bugfix on 0.1.2.x.


svn:r13372

1 files changed, 0 insertions, 8 deletions

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 4f57922160..785926b09b 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1577,10 +1577,6 @@ choose_good_middle_server(uint8_t purpose,
     smartlist_add(excluded, r);
     routerlist_add_family(excluded, r);
   }
-  if ((r = routerlist_find_my_routerinfo())) {
-    smartlist_add(excluded, r);
-    routerlist_add_family(excluded, r);
-  }
   for (i = 0, cpath = head; i < cur_len; ++i, cpath=cpath->next) {
     if ((r = router_get_by_digest(cpath->extend_info->identity_digest))) {
       smartlist_add(excluded, r);
@@ -1624,10 +1620,6 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state)
     smartlist_add(excluded, r);
     routerlist_add_family(excluded, r);
   }
-  if ((r = routerlist_find_my_routerinfo())) {
-    smartlist_add(excluded, r);
-    routerlist_add_family(excluded, r);
-  }
   if (firewall_is_fascist_or()) {
     /* exclude all ORs that listen on the wrong port */
     routerlist_t *rl = router_get_routerlist();