mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 06:48:05 +01:00
Code Issues Projects Releases Wiki Activity

remove crazy notion that clique_mode() means we are

Browse source 
already connected to everybody we could be connected to.


svn:r2283
This commit is contained in:
Roger Dingledine 2004-08-18 09:07:11 +00:00
parent 40f9f94794
commit b885db033e
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/or/circuitbuild.c
View file

@ -1016,7 +1016,6 @@ onion_new_cpath_build_state(uint8_t purpose, const char *exit_digest)
static int count_acceptable_routers(smartlist_t *routers) { static int count_acceptable_routers(smartlist_t *routers) {
int i, j, n; int i, j, n;
int num=0; int num=0;
connection_t *conn;
routerinfo_t *r, *r2; routerinfo_t *r, *r2;
n = smartlist_len(routers); n = smartlist_len(routers);
@ -1032,14 +1031,6 @@ static int count_acceptable_routers(smartlist_t *routers) {
log_fn(LOG_DEBUG,"Nope, the directory says %d is not verified.",i); log_fn(LOG_DEBUG,"Nope, the directory says %d is not verified.",i);
goto next_i_loop; /* XXX008 */ goto next_i_loop; /* XXX008 */
} }
if(clique_mode()) {
conn = connection_get_by_identity_digest(r->identity_digest,
CONN_TYPE_OR);
if(!conn || conn->state != OR_CONN_STATE_OPEN) {
log_fn(LOG_DEBUG,"Nope, %d is not connected.",i);
goto next_i_loop;
}
}
for(j=0;j<i;j++) { for(j=0;j<i;j++) {
r2 = smartlist_get(routers, j); r2 = smartlist_get(routers, j);
if(!crypto_pk_cmp_keys(r->onion_pkey, r2->onion_pkey)) { if(!crypto_pk_cmp_keys(r->onion_pkey, r2->onion_pkey)) {

8
src/or/routerlist.c
View file

@ -202,15 +202,7 @@ router_add_running_routers_to_smartlist(smartlist_t *sl, int allow_unverified)
router = smartlist_get(routerlist->routers, i); router = smartlist_get(routerlist->routers, i);
if(router->is_running && if(router->is_running &&
(allow_unverified || router->is_verified)) { (allow_unverified || router->is_verified)) {
if(!clique_mode()) {
smartlist_add(sl, router); smartlist_add(sl, router);
} else {
connection_t *conn =
connection_get_by_identity_digest(router->identity_digest,
CONN_TYPE_OR);
if(conn && conn->state == OR_CONN_STATE_OPEN)
smartlist_add(sl, router);
}
} }
} }
} }