don't pick myself or my twins as hops when building circuits

svn:r1531

2 files changed, 14 insertions, 3 deletions

diff --git a/src/or/circuit.c b/src/or/circuit.c
index be1c5a6d9f..916c7af00a 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -1159,7 +1159,7 @@ static void circuit_build_failed(circuit_t *circ) {
     case CIRCUIT_PURPOSE_C_INTRODUCING:
       /* at Alice, connecting to intro point */
       /* Don't increment failure count, since Bob may have picked
-       * the inttroduction point badly */
+       * the introduction point maliciously */
       /* Alice will pick a new intro point when this one dies, if
        * the stream in question still cares. No need to act here. */
       break;
@@ -1174,11 +1174,11 @@ static void circuit_build_failed(circuit_t *circ) {
     case CIRCUIT_PURPOSE_S_CONNECT_REND:
       /* at Bob, connecting to rend point */
       /* Don't increment failure count, since Alice may have picked
-       * the rendezvous point badly */
+       * the rendezvous point maliciously */
       log_fn(LOG_INFO,"Couldn't connect to Alice's chosen rend point %s. Sucks to be Alice.", circ->build_state->chosen_exit);
       break;
     default:
-      /* Other cases are impossible, since this function is only caused with
+      /* Other cases are impossible, since this function is only called with
        * unbuilt circuits. */
       assert(0);
   }
diff --git a/src/or/onion.c b/src/or/onion.c
index 295dc4fec2..d97c397973 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -231,6 +231,14 @@ static routerinfo_t *choose_good_exit_server_general(routerlist_t *dir)
   n_supported = tor_malloc(sizeof(int)*smartlist_len(dir->routers));
   for (i = 0; i < smartlist_len(dir->routers); ++i) { /* iterate over routers */
     router = smartlist_get(dir->routers, i);
+    if(router_is_me(router)) {
+      n_supported[i] = -1;
+      log_fn(LOG_DEBUG,"Skipping node %s -- it's me.", router->nickname);
+      /* XXX there's probably a reverse predecessor attack here, but
+       * it's slow. should we take this out? -RD
+       */
+      continue;
+    }
     if(!router->is_running) {
       n_supported[i] = -1;
       log_fn(LOG_DEBUG,"Skipping node %s (index %d) -- directory says it's not running.",
@@ -474,6 +482,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout
     add_nickname_list_to_smartlist(sl,options.EntryNodes);
     /* XXX one day, consider picking chosen_exit knowing what's in EntryNodes */
     remove_twins_from_smartlist(sl,router_get_by_nickname(state->chosen_exit));
+    remove_twins_from_smartlist(sl,router_get_my_routerinfo());
     smartlist_subtract(sl,excludednodes);
     choice = smartlist_choose(sl);
     smartlist_free(sl);
@@ -481,6 +490,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout
       sl = smartlist_create();
       router_add_running_routers_to_smartlist(sl);
       remove_twins_from_smartlist(sl,router_get_by_nickname(state->chosen_exit));
+      remove_twins_from_smartlist(sl,router_get_my_routerinfo());
       smartlist_subtract(sl,excludednodes);
       choice = smartlist_choose(sl);
       smartlist_free(sl);
@@ -495,6 +505,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout
     sl = smartlist_create();
     router_add_running_routers_to_smartlist(sl);
     remove_twins_from_smartlist(sl,router_get_by_nickname(state->chosen_exit));
+    remove_twins_from_smartlist(sl,router_get_my_routerinfo());
     for (i = 0, cpath = *head_ptr; i < cur_len; ++i, cpath=cpath->next) {
       r = router_get_by_addr_port(cpath->addr, cpath->port);
       assert(r);