aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-09-22 16:52:51 -0400
committerNick Mathewson <nickm@torproject.org>2009-10-15 15:17:13 -0400
commitd9c71816b15af4325fb8ab9befa8600185d9aa90 (patch)
treee8ed61542ffa7ae598aae28547dbb1bc3ebcf0ed /src/or/or.h
parent5576a3a094de49246e501bb24d1b3dc3a5d610b9 (diff)
downloadtor-d9c71816b15af4325fb8ab9befa8600185d9aa90.tar
tor-d9c71816b15af4325fb8ab9befa8600185d9aa90.tar.gz
Generate all the flavors of consensuses when building consensuses.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h
index e2050ecae..b8ccac923 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1688,10 +1688,13 @@ typedef enum {
/** DOCDOC */
typedef enum {
- FLAV_NS,
- FLAV_MICRODESC,
+ FLAV_NS = 0,
+ FLAV_MICRODESC = 1,
} consensus_flavor_t;
+/** DOCDOC */
+#define N_CONSENSUS_FLAVORS ((int)(FLAV_MICRODESC)+1)
+
/** A common structure to hold a v3 network status vote, or a v3 network
* status consensus. */
typedef struct networkstatus_t {
@@ -3863,7 +3866,7 @@ int dirvote_add_signatures(const char *detached_signatures_body,
const char **msg_out);
/* Item access */
-const char *dirvote_get_pending_consensus(void);
+const char *dirvote_get_pending_consensus(consensus_flavor_t flav);
const char *dirvote_get_pending_detached_signatures(void);
#define DGV_BY_ID 1
#define DGV_INCLUDE_PENDING 2