diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-05 21:39:29 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-05 21:39:29 +0000 |
| commit | c8a689c9e8ce3a03c5815da2535b56812450d5ae (patch) | |
| tree | fd1d285c68f4cbd0669de559fd00ab4b391833eb /src/or/dirserv.c | |
| parent | a51deb9a9c7bf33ba353e008724c150bddde144b (diff) | |
| download | tor-c8a689c9e8ce3a03c5815da2535b56812450d5ae.tar tor-c8a689c9e8ce3a03c5815da2535b56812450d5ae.tar.gz | |
r17909@catbus: nickm | 2008-02-05 14:48:22 -0500
As planned, rename networkstatus_vote_t to networkstatus_t, now that v3 networkstatuses are working and standard and v2 networkstatuses are obsolete.
svn:r13383
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f86bff9e0..b9dc252b0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2105,14 +2105,14 @@ router_clear_status_flags(routerinfo_t *router) * information is not accurate. */ #define DIRSERV_TIME_TO_GET_REACHABILITY_INFO (30*60) -/** Return a new networkstatus_vote_t* containing our current opinion. (For v3 +/** Return a new networkstatus_t* containing our current opinion. (For v3 * authorities) */ -networkstatus_vote_t * +networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, authority_cert_t *cert) { or_options_t *options = get_options(); - networkstatus_vote_t *v3_out = NULL; + networkstatus_t *v3_out = NULL; uint32_t addr; char *hostname = NULL, *client_versions = NULL, *server_versions = NULL; const char *contact; @@ -2206,14 +2206,14 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, smartlist_free(routers); digestmap_free(omit_as_sybil, NULL); - v3_out = tor_malloc_zero(sizeof(networkstatus_vote_t)); + v3_out = tor_malloc_zero(sizeof(networkstatus_t)); v3_out->is_vote = 1; dirvote_get_preferred_voting_intervals(&timing); v3_out->published = now; { char tbuf[ISO_TIME_LEN+1]; - networkstatus_vote_t *current_consensus = + networkstatus_t *current_consensus = networkstatus_get_live_consensus(now); time_t last_consensus_interval; /* only used to pick a valid_after */ if (current_consensus) |