aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
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/or.h
parentba1143e4680c9f41c1c2040a1181c522c9bb8e8d (diff)
downloadtor-6e58575767929b696035bc8385705ea3aa8b6838.tar
tor-6e58575767929b696035bc8385705ea3aa8b6838.tar.gz
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/or.h')
-rw-r--r--src/or/or.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 0becc3cda..62054a302 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2107,7 +2107,7 @@ typedef enum {
BRIDGE_AUTHORITY = 1 << 4,
/** Serves extrainfo documents. (XXX Not precisely an authority type)*/
EXTRAINFO_CACHE = 1 << 5,
-} authority_type_t;
+} dirinfo_type_t;
#define CRYPT_PATH_MAGIC 0x70127012u
@@ -2642,7 +2642,7 @@ typedef struct {
* "v1", "v2", "v3", "bridge", or "". */
smartlist_t *PublishServerDescriptor;
/** An authority type, derived from PublishServerDescriptor. */
- authority_type_t _PublishServerDescriptor;
+ dirinfo_type_t _PublishServerDescriptor;
/** Boolean: do we publish hidden service descriptors to the HS auths? */
int PublishHidServDescriptors;
int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */
@@ -3648,7 +3648,7 @@ typedef struct trusted_dir_server_t {
unsigned int has_accepted_serverdesc:1;
/** What kind of authority is this? (Bitfield.) */
- authority_type_t type;
+ dirinfo_type_t type;
download_status_t v2_ns_dl_status; /**< Status of downloading this server's
* v2 network status. */