aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-11-08 14:27:36 -0500
committerNick Mathewson <nickm@torproject.org>2011-05-05 20:54:11 -0400
commit6e58575767929b696035bc8385705ea3aa8b6838 (patch)
treeb2e917b147b275800a4e38efa16fe82f456c1e2c /src/or/directory.c
parentba1143e4680c9f41c1c2040a1181c522c9bb8e8d (diff)
downloadtor-6e58575767929b696035bc8385705ea3aa8b6838.tar.gz
tor-6e58575767929b696035bc8385705ea3aa8b6838.zip
Automated rename from authority_type_t to dirinfo_type_t
We were already overloading this type to mean "a directory that can serve us X" in addition to "a directory that is an authority for X."
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 33ebf5263d..3effd37ca4 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -149,7 +149,7 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose)
/** Return a newly allocated string describing <b>auth</b>. */
char *
-authority_type_to_string(authority_type_t auth)
+dirinfo_type_to_string(dirinfo_type_t auth)
{
char *result;
smartlist_t *lst = smartlist_create();
@@ -280,7 +280,7 @@ directories_have_accepted_server_descriptor(void)
*/
void
directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
- authority_type_t type,
+ dirinfo_type_t type,
const char *payload,
size_t payload_len, size_t extrainfo_len)
{
@@ -328,7 +328,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
NULL, payload, upload_len, 0);
} SMARTLIST_FOREACH_END(ds);
if (!found) {
- char *s = authority_type_to_string(type);
+ char *s = dirinfo_type_to_string(type);
log_warn(LD_DIR, "Publishing server descriptor to directory authorities "
"of type '%s', but no authorities of that type listed!", s);
tor_free(s);
@@ -349,7 +349,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
or_options_t *options = get_options();
int prefer_authority = directory_fetches_from_authorities(options);
int get_via_tor = purpose_needs_anonymity(dir_purpose, router_purpose);
- authority_type_t type;
+ dirinfo_type_t type;
time_t if_modified_since = 0;
/* FFFF we could break this switch into its own function, and call