mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

r14887@Kushana: nickm | 2007-10-11 11:19:39 -0400

Browse Source 
Fix some XXX020s in dirserv.c


svn:r11870
This commit is contained in:
Nick Mathewson 2007-10-11 16:06:51 +00:00
parent 52ca3a7610
commit 007d76543d
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/or/dirserv.c
View File

@ -1446,7 +1446,7 @@ static int
should_generate_v2_networkstatus(void) should_generate_v2_networkstatus(void)
{ {
return authdir_mode_v2(get_options()) && return authdir_mode_v2(get_options()) &&
!authdir_mode_bridge(get_options()) && /* XXX020 */ !authdir_mode_bridge(get_options()) && /* XXX020 RD */
the_v2_networkstatus_is_dirty && the_v2_networkstatus_is_dirty &&
the_v2_networkstatus_is_dirty + DIR_REGEN_SLACK_TIME < time(NULL); the_v2_networkstatus_is_dirty + DIR_REGEN_SLACK_TIME < time(NULL);
} }
@ -1554,7 +1554,6 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
tor_malloc(sizeof(uint32_t)*smartlist_len(rl->routers)); tor_malloc(sizeof(uint32_t)*smartlist_len(rl->routers));
mtbfs = tor_malloc(sizeof(double)*smartlist_len(rl->routers)); mtbfs = tor_malloc(sizeof(double)*smartlist_len(rl->routers));
/* XXXX020 we should just use arrays and qsort. */
SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri, { SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ri, {
if (router_is_active(ri, now)) { if (router_is_active(ri, now)) {
const char *id = ri->cache_info.identity_digest; const char *id = ri->cache_info.identity_digest;
@ -1823,10 +1822,6 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
router_is_active(ri, now) && router_is_active(ri, now) &&
!dirserv_thinks_router_is_unreliable(now, ri, 0, 1); !dirserv_thinks_router_is_unreliable(now, ri, 0, 1);
rs->is_running = ri->is_running; /* computed above */ rs->is_running = ri->is_running; /* computed above */
/*
int f_authority = router_digest_is_trusted_dir(
ri->cache_info.identity_digest);
*/
rs->is_named = naming && ri->is_named; rs->is_named = naming && ri->is_named;
rs->is_valid = ri->is_valid; rs->is_valid = ri->is_valid;
rs->is_possible_guard = rs->is_fast && rs->is_stable && rs->is_possible_guard = rs->is_fast && rs->is_stable &&
@ -1879,8 +1874,6 @@ generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
vote_timing_t timing; vote_timing_t timing;
digestmap_t *omit_as_sybil = NULL; digestmap_t *omit_as_sybil = NULL;
/* check that everything is deallocated XXXX020 */
tor_assert(private_key); tor_assert(private_key);
tor_assert(cert); tor_assert(cert);
@ -1999,8 +1992,9 @@ generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
v3_out->voters = smartlist_create(); v3_out->voters = smartlist_create();
smartlist_add(v3_out->voters, voter); smartlist_add(v3_out->voters, voter);
v3_out->cert = authority_cert_dup(cert); v3_out->cert = authority_cert_dup(cert);
/* ????? networkstatus_digest is unset. */
v3_out->routerstatus_list = routerstatuses; v3_out->routerstatus_list = routerstatuses;
/* Note: networkstatus_digest is unset; it won't get set until we actually
* format the vote. */
return v3_out; return v3_out;
} }
@ -2025,25 +2019,17 @@ format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
(LONGEST_STATUS_FLAG_NAME_LEN+1)*N_STATUS_FLAGS + 2) (LONGEST_STATUS_FLAG_NAME_LEN+1)*N_STATUS_FLAGS + 2)
size_t len; size_t len;
char *status = NULL, *client_versions = NULL, *server_versions = NULL; char *status = NULL;
const char *client_versions = NULL, *server_versions = NULL;
char *outp, *endp; char *outp, *endp;
// or_options_t *options = get_options();
char fingerprint[FINGERPRINT_LEN+1]; char fingerprint[FINGERPRINT_LEN+1];
char ipaddr[INET_NTOA_BUF_LEN]; char ipaddr[INET_NTOA_BUF_LEN];
char digest[DIGEST_LEN]; char digest[DIGEST_LEN];
struct in_addr in; struct in_addr in;
uint32_t addr; uint32_t addr;
routerlist_t *rl = router_get_routerlist(); routerlist_t *rl = router_get_routerlist();
// time_t now = time(NULL);
// time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH;
/*
int naming = options->NamingAuthoritativeDir;
int listbadexits = options->AuthDirListBadExits;
int exits_can_be_guards;
*/
char *version_lines = NULL; char *version_lines = NULL;
networkstatus_voter_info_t *voter; networkstatus_voter_info_t *voter;
/* XXX020 check that everything gets freed */
tor_assert(private_signing_key); tor_assert(private_signing_key);
@ -2940,7 +2926,8 @@ connection_dirserv_add_dir_bytes_to_outbuf(dir_connection_t *conn)
* <b>conn</b>, and the outbuf has become too empty. If the current * <b>conn</b>, and the outbuf has become too empty. If the current
* networkstatus object (in <b>conn</b>-\>cached_dir) has more data, pull data * networkstatus object (in <b>conn</b>-\>cached_dir) has more data, pull data
* from there. Otherwise, pop the next fingerprint from fingerprint_stack, * from there. Otherwise, pop the next fingerprint from fingerprint_stack,
* and start spooling the next networkstatus. If we run out of entries, * and start spooling the next networkstatus. (A digest of all 0 bytes is
* treated as a request for the current consensus.) If we run out of entries,
* flushes the zlib state and sets the spool source to NONE. Returns 0 on * flushes the zlib state and sets the spool source to NONE. Returns 0 on
* success, negative on failure. */ * success, negative on failure. */
static int static int
@ -2970,7 +2957,7 @@ connection_dirserv_add_networkstatus_bytes_to_outbuf(dir_connection_t *conn)
/* Add another networkstatus; start serving it. */ /* Add another networkstatus; start serving it. */
char *fp = smartlist_pop_last(conn->fingerprint_stack); char *fp = smartlist_pop_last(conn->fingerprint_stack);
cached_dir_t *d; cached_dir_t *d;
if (tor_digest_is_zero(fp)) /* XXXX020 document this "feature". */ if (tor_digest_is_zero(fp))
d = cached_v3_networkstatus; d = cached_v3_networkstatus;
else if (router_digest_is_me(fp)) else if (router_digest_is_me(fp))
d = the_v2_networkstatus; d = the_v2_networkstatus;