commit 194cc24792056952de00a67b4983c3cd4f683ce5 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 22:55:53 2012 -0400

Make output of router_get_trusted_dir_servers const --- src/or/directory.c | 6 +++--- src/or/dirserv.c | 2 +- src/or/routerlist.c | 2 +- src/or/routerlist.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c index 1d511b5..c7fb0c4 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -244,7 +244,7 @@ router_supports_extrainfo(const char *identity_digest, int is_authority) int 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(); SMARTLIST_FOREACH(servers, trusted_dir_server_t *, d, { 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(); int post_via_tor; - smartlist_t *dirservers = router_get_trusted_dir_servers(); + const smartlist_t *dirservers = router_get_trusted_dir_servers(); int found = 0; const int exclude_self = (dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || 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 * code, since we don't want to keep trying forever in a tight loop * 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, download_status_failed(&ds->v2_ns_dl_status, 0)); directory_get_from_dirserver(conn->base_.purpose, conn->router_purpose, diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c1ddf73..8be436d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1478,7 +1478,7 @@ dirserv_set_cached_networkstatus_v2(const char *networkstatus, time_t published) { cached_dir_t *d, *old_d; - smartlist_t *trusted_dirs; + const smartlist_t *trusted_dirs; if (!cached_v2_networkstatus) cached_v2_networkstatus = digestmap_new();

diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1735837..2a146ba 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -918,7 +918,7 @@ router_reload_router_list(void) * known trusted dirservers. Callers must not modify the list or its * contents. */ -smartlist_t * +const smartlist_t * router_get_trusted_dir_servers(void) { if (!trusted_dir_servers) diff --git a/src/or/routerlist.h b/src/or/routerlist.h index c838199..3c659e8 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -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); int router_reload_router_list(void); 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, int flags);