diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-04-07 21:12:54 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-04-07 21:12:54 +0000 |
| commit | 93801ac40de18a7a6f644930795c2d1933c698cc (patch) | |
| tree | 6508180e4f83cd8c836273b898339a6bb4a53da5 /src/or/onion.c | |
| parent | 2633d353d70bc2356c991f19cc9ad2f3408f2b6d (diff) | |
| download | tor-93801ac40de18a7a6f644930795c2d1933c698cc.tar.gz tor-93801ac40de18a7a6f644930795c2d1933c698cc.zip | |
don't pick myself or my twins as hops when building circuits
svn:r1531
Diffstat (limited to 'src/or/onion.c')
| -rw-r--r-- | src/or/onion.c | 11 |
1 files changed, 11 insertions, 0 deletions
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); |