diff options
author | Nick Mathewson <nickm@torproject.org> | 2004-03-30 22:59:00 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2004-03-30 22:59:00 +0000 |
commit | 93ab51e9ac6173d3aebde2df1393ee2ee7f6a28e (patch) | |
tree | 7fc72f4ce789e840f04b8632d5b5799b31cb26b5 /src/or | |
parent | 2d3ac08633a47617c1244caab8b41f73604e0d48 (diff) | |
download | tor-93ab51e9ac6173d3aebde2df1393ee2ee7f6a28e.tar tor-93ab51e9ac6173d3aebde2df1393ee2ee7f6a28e.tar.gz |
Make smartlist Do What Arma Expects.
svn:r1401
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/circuit.c | 2 | ||||
-rw-r--r-- | src/or/onion.c | 14 | ||||
-rw-r--r-- | src/or/routerlist.c | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c index 05ee82d3e..017194dae 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -946,7 +946,7 @@ void circuit_expire_unused_circuits(void) { smartlist_t *unused_open_circs; int i; - unused_open_circs = smartlist_create(circuitlist_len); + unused_open_circs = smartlist_create(); for (circ = global_circuitlist; circ; circ = circ->next) { if (circ->marked_for_close) diff --git a/src/or/onion.c b/src/or/onion.c index 20a948487..64f2581c2 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(16); + preferredexits = smartlist_create(); add_nickname_list_to_smartlist(preferredexits,options.ExitNodes); - excludedexits = smartlist_create(16); + excludedexits = smartlist_create(); add_nickname_list_to_smartlist(excludedexits,options.ExcludeNodes); - sl = smartlist_create(dir->n_routers); + sl = smartlist_create(); /* 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(16); + excludednodes = smartlist_create(); 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(16); + sl = smartlist_create(); 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(32); + sl = smartlist_create(); 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(32); + sl = smartlist_create(); 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) { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 40d90d522..8c2f7103d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -164,7 +164,7 @@ static routerinfo_t *router_pick_directory_server_impl(void) { if(!routerlist) return NULL; - sl = smartlist_create(8); + sl = smartlist_create(); for(i=0;i<routerlist->n_routers;i++) { router = routerlist->routers[i]; if(router->dir_port > 0 && router->is_running) @@ -605,7 +605,7 @@ router_get_routerlist_from_directory_impl(const char *str, end = str + strlen(str); } - tokens = smartlist_create(16); + tokens = smartlist_create(); if (tokenize_string(str,end,tokens,1)) { log_fn(LOG_WARN, "Error tokenizing directory"); goto err; } @@ -671,7 +671,7 @@ router_get_routerlist_from_directory_impl(const char *str, token_free((directory_token_t*)tokens->list[i]); } smartlist_free(tokens); - tokens = smartlist_create(16); + tokens = smartlist_create(); if (tokenize_string(str,str+strlen(str),tokens,1)<0) { log_fn(LOG_WARN, "Error tokenizing signature"); goto err; } @@ -817,7 +817,7 @@ routerinfo_t *router_get_entry_from_string(const char *s, log_fn(LOG_WARN, "Couldn't compute router hash."); return NULL; } - tokens = smartlist_create(16); + tokens = smartlist_create(); if (tokenize_string(s,end,tokens,0)) { log_fn(LOG_WARN, "Error tokeninzing router descriptor."); goto err; } @@ -1403,7 +1403,7 @@ find_all_exitpolicy(smartlist_t *s) { int i; directory_token_t *tok; - smartlist_t *out = smartlist_create(s->num_used); + smartlist_t *out = smartlist_create(); for (i = 0; i < s->num_used; ++i) { tok = (directory_token_t*) s->list[i]; if (tok->tp == K_ACCEPT || tok->tp == K_REJECT) { |