mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-13 06:33:44 +01:00
r15634@catbus: nickm | 2007-10-10 14:26:49 -0400
Resolve/ignore some XXXXs, and be even more careful about listing a server as a v3 authority. svn:r11839
This commit is contained in:
parent
b599d4264f
commit
b5301d81db
@ -1310,7 +1310,8 @@ dirvote_clear_votes(int all_votes)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXXX020 delete me. */
|
/** Return a newly allocated string containing the hex-encoded v3 authority
|
||||||
|
identity digest of every recognized v3 authority. */
|
||||||
static char *
|
static char *
|
||||||
list_v3_auth_ids(void)
|
list_v3_auth_ids(void)
|
||||||
{
|
{
|
||||||
@ -1318,9 +1319,10 @@ list_v3_auth_ids(void)
|
|||||||
char *keys;
|
char *keys;
|
||||||
SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
|
SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
|
||||||
trusted_dir_server_t *, ds,
|
trusted_dir_server_t *, ds,
|
||||||
if (!tor_digest_is_zero(ds->v3_identity_digest))
|
if ((ds->type & V3_AUTHORITY) &&
|
||||||
smartlist_add(known_v3_keys,
|
!tor_digest_is_zero(ds->v3_identity_digest))
|
||||||
tor_strdup(hex_str(ds->v3_identity_digest, DIGEST_LEN))));
|
smartlist_add(known_v3_keys,
|
||||||
|
tor_strdup(hex_str(ds->v3_identity_digest, DIGEST_LEN))));
|
||||||
keys = smartlist_join_strings(known_v3_keys, ", ", 0, NULL);
|
keys = smartlist_join_strings(known_v3_keys, ", ", 0, NULL);
|
||||||
SMARTLIST_FOREACH(known_v3_keys, char *, cp, tor_free(cp));
|
SMARTLIST_FOREACH(known_v3_keys, char *, cp, tor_free(cp));
|
||||||
smartlist_free(known_v3_keys);
|
smartlist_free(known_v3_keys);
|
||||||
@ -1610,7 +1612,6 @@ dirvote_add_signatures_to_pending_consensus(
|
|||||||
sigs);
|
sigs);
|
||||||
|
|
||||||
if (r >= 0) {
|
if (r >= 0) {
|
||||||
/* XXXX This should really be its own function. */
|
|
||||||
char *new_detached =
|
char *new_detached =
|
||||||
networkstatus_get_detached_signatures(pending_consensus);
|
networkstatus_get_detached_signatures(pending_consensus);
|
||||||
const char *src;
|
const char *src;
|
||||||
|
Loading…
Reference in New Issue
Block a user