nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 17:13:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make output of router_get_trusted_dir_servers const

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-07 22:55:53 -04:00
parent bd93ff8dd7
commit 194cc24792
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/directory.c
View File

@ -244,7 +244,7 @@ router_supports_extrainfo(const char *identity_digest, int is_authority)
int int
directories_have_accepted_server_descriptor(void) directories_have_accepted_server_descriptor(void)
{ {
smartlist_t *servers = router_get_trusted_dir_servers(); const smartlist_t *servers = router_get_trusted_dir_servers();
const or_options_t *options = get_options(); const or_options_t *options = get_options();
SMARTLIST_FOREACH(servers, trusted_dir_server_t *, d, { SMARTLIST_FOREACH(servers, trusted_dir_server_t *, d, {
if ((d->type & options->PublishServerDescriptor_) && if ((d->type & options->PublishServerDescriptor_) &&
@ -280,7 +280,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
{ {
const or_options_t *options = get_options(); const or_options_t *options = get_options();
int post_via_tor; int post_via_tor;
smartlist_t *dirservers = router_get_trusted_dir_servers(); const smartlist_t *dirservers = router_get_trusted_dir_servers();
int found = 0; int found = 0;
const int exclude_self = (dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || const int exclude_self = (dir_purpose == DIR_PURPOSE_UPLOAD_VOTE ||
dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES); dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES);
@ -716,7 +716,7 @@ connection_dir_download_v2_networkstatus_failed(dir_connection_t *conn,
/* We're a non-authoritative directory cache; try again. Ignore status /* We're a non-authoritative directory cache; try again. Ignore status
* code, since we don't want to keep trying forever in a tight loop * code, since we don't want to keep trying forever in a tight loop
* if all the authorities are shutting us out. */ * if all the authorities are shutting us out. */
smartlist_t *trusted_dirs = router_get_trusted_dir_servers(); const smartlist_t *trusted_dirs = router_get_trusted_dir_servers();
SMARTLIST_FOREACH(trusted_dirs, trusted_dir_server_t *, ds, SMARTLIST_FOREACH(trusted_dirs, trusted_dir_server_t *, ds,
download_status_failed(&ds->v2_ns_dl_status, 0)); download_status_failed(&ds->v2_ns_dl_status, 0));
directory_get_from_dirserver(conn->base_.purpose, conn->router_purpose, directory_get_from_dirserver(conn->base_.purpose, conn->router_purpose,

2
src/or/dirserv.c
View File

@ -1478,7 +1478,7 @@ dirserv_set_cached_networkstatus_v2(const char *networkstatus,
time_t published) time_t published)
{ {
cached_dir_t *d, *old_d; cached_dir_t *d, *old_d;
smartlist_t *trusted_dirs; const smartlist_t *trusted_dirs;
if (!cached_v2_networkstatus) if (!cached_v2_networkstatus)
cached_v2_networkstatus = digestmap_new(); cached_v2_networkstatus = digestmap_new();

2
src/or/routerlist.c
View File

@ -918,7 +918,7 @@ router_reload_router_list(void)
* known trusted dirservers. Callers must not modify the list or its * known trusted dirservers. Callers must not modify the list or its
* contents. * contents.
*/ */
smartlist_t * const smartlist_t *
router_get_trusted_dir_servers(void) router_get_trusted_dir_servers(void)
{ {
if (!trusted_dir_servers) if (!trusted_dir_servers)

2
src/or/routerlist.h
View File

@ -25,7 +25,7 @@ void authority_cert_dl_failed(const char *id_digest, int status);
void authority_certs_fetch_missing(networkstatus_t *status, time_t now); void authority_certs_fetch_missing(networkstatus_t *status, time_t now);
int router_reload_router_list(void); int router_reload_router_list(void);
int authority_cert_dl_looks_uncertain(const char *id_digest); int authority_cert_dl_looks_uncertain(const char *id_digest);
smartlist_t *router_get_trusted_dir_servers(void); const smartlist_t *router_get_trusted_dir_servers(void);
const routerstatus_t *router_pick_directory_server(dirinfo_type_t type, const routerstatus_t *router_pick_directory_server(dirinfo_type_t type,
int flags); int flags);