diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-03-30 20:05:52 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-03-30 20:05:52 +0000 |
| commit | 96a86ef14d8b4f2377e19070ae930de730efd2f8 (patch) | |
| tree | 779bf8db11c9b31a250d86880c161916450087a1 /src/or/onion.c | |
| parent | 0ba9ab5fb05ceb064a24e2db91e7a2f72cea2722 (diff) | |
| download | tor-96a86ef14d8b4f2377e19070ae930de730efd2f8.tar.gz tor-96a86ef14d8b4f2377e19070ae930de730efd2f8.zip | |
Remove maximum-size field from smartlists
svn:r1397
Diffstat (limited to 'src/or/onion.c')
| -rw-r--r-- | src/or/onion.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/onion.c b/src/or/onion.c index a4a09741e2..20a9484874 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -300,13 +300,13 @@ static routerinfo_t *choose_good_exit_server(routerlist_t *dir) log_fn(LOG_INFO, "Found %d servers that might support %d/%d pending connections.", n_best_support, best_support, n_pending_connections); - preferredexits = smartlist_create(MAX_ROUTERS_IN_DIR); + preferredexits = smartlist_create(16); add_nickname_list_to_smartlist(preferredexits,options.ExitNodes); - excludedexits = smartlist_create(MAX_ROUTERS_IN_DIR); + excludedexits = smartlist_create(16); add_nickname_list_to_smartlist(excludedexits,options.ExcludeNodes); - sl = smartlist_create(MAX_ROUTERS_IN_DIR); + sl = smartlist_create(dir->n_routers); /* If any routers definitely support any pending connections, choose one * at random. */ @@ -450,7 +450,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout log_fn(LOG_DEBUG, "Path is %d long; we want %d", cur_len, state->desired_path_len); - excludednodes = smartlist_create(MAX_ROUTERS_IN_DIR); + excludednodes = smartlist_create(16); add_nickname_list_to_smartlist(excludednodes,options.ExcludeNodes); if(cur_len == state->desired_path_len - 1) { /* Picking last node */ @@ -465,7 +465,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout } } else if(cur_len == 0) { /* picking first node */ /* try the nodes in EntryNodes first */ - sl = smartlist_create(MAX_ROUTERS_IN_DIR); + sl = smartlist_create(16); 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)); @@ -473,7 +473,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout choice = smartlist_choose(sl); smartlist_free(sl); if(!choice) { - sl = smartlist_create(MAX_ROUTERS_IN_DIR); + sl = smartlist_create(32); router_add_running_routers_to_smartlist(sl); remove_twins_from_smartlist(sl,router_get_by_nickname(state->chosen_exit)); smartlist_subtract(sl,excludednodes); @@ -487,7 +487,7 @@ int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state, rout } } else { log_fn(LOG_DEBUG, "Contemplating intermediate hop: random choice."); - sl = smartlist_create(MAX_ROUTERS_IN_DIR); + sl = smartlist_create(32); router_add_running_routers_to_smartlist(sl); remove_twins_from_smartlist(sl,router_get_by_nickname(state->chosen_exit)); for (i = 0, cpath = *head_ptr; i < cur_len; ++i, cpath=cpath->next) { |