- tor-commits - lists.torproject.org

[tor/master] tell me who votes are actually for, not just where they're from
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 78e95b7b713c15b40303d63b96dbf9a8070b6cf7 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 10:03:46 2012 -0500 tell me who votes are actually for, not just where they're from --- src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/test/test_dir.c | 12 ++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c6ce9f6..2fd94ea 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -35,10 +35,13 @@ typedef struct pending_consensus_t { static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, + const char *source, const char **msg_out); static int dirvote_add_signatures_to_pending_consensus( pending_consensus_t *pc, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); static char *list_v3_auth_ids(void); static void dirvote_fetch_missing_votes(void); @@ -2168,6 +2171,8 @@ networkstatus_compute_consensus(smartlist_t *votes, int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out) { int r = 0; @@ -2270,6 +2275,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target, if (sig->good_signature || !old_sig || old_sig->bad_signature) { log_info(LD_DIR, "Adding signature from %s with %s", voter_identity, algorithm); + log(severity, LD_DIR, "Added a signature for %s from %s.", + voter_identity, source); ++r; if (old_sig) { smartlist_remove(target_voter->sigs, old_sig); @@ -3198,7 +3205,8 @@ dirvote_compute_consensuses(void) SMARTLIST_FOREACH(pending_consensus_signature_list, char *, sig, { const char *msg = NULL; - int r = dirvote_add_signatures_to_all_pending_consensuses(sig, &msg); + int r = dirvote_add_signatures_to_all_pending_consensuses(sig, + "pending", &msg); if (r >= 0) n_sigs += r; else @@ -3240,6 +3248,8 @@ static int dirvote_add_signatures_to_pending_consensus( pending_consensus_t *pc, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out) { const char *flavor_name; @@ -3258,7 +3268,8 @@ dirvote_add_signatures_to_pending_consensus( log_info(LD_DIR, "Have %d signatures for adding to %s consensus.", sig_list ? smartlist_len(sig_list) : 0, flavor_name); } - r = networkstatus_add_detached_signatures(pc->consensus, sigs, msg_out); + r = networkstatus_add_detached_signatures(pc->consensus, sigs, + source, severity, msg_out); log_info(LD_DIR,"Added %d signatures to consensus.", r); if (r >= 1) { @@ -3307,6 +3318,7 @@ dirvote_add_signatures_to_pending_consensus( static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, + const char *source, const char **msg_out) { int r=0, i, n_added = 0, errors = 0; @@ -3323,10 +3335,12 @@ dirvote_add_signatures_to_all_pending_consensuses( for (i = 0; i < N_CONSENSUS_FLAVORS; ++i) { int res; + int severity = i == FLAV_NS ? LOG_NOTICE : LOG_INFO; pending_consensus_t *pc = &pending_consensuses[i]; if (!pc->consensus) continue; - res = dirvote_add_signatures_to_pending_consensus(pc, sigs, msg_out); + res = dirvote_add_signatures_to_pending_consensus(pc, sigs, source, + severity, msg_out); if (res < 0) errors++; else @@ -3373,7 +3387,7 @@ dirvote_add_signatures(const char *detached_signatures_body, log_notice(LD_DIR, "Got a signature from %s. " "Adding it to the pending consensus.", source); return dirvote_add_signatures_to_all_pending_consensuses( - detached_signatures_body, msg); + detached_signatures_body, source, msg); } else { log_notice(LD_DIR, "Got a signature from %s. " "Queuing it for the next consensus.", source); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index de11fcf..b8acd6a 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -31,6 +31,8 @@ char *networkstatus_compute_consensus(smartlist_t *votes, consensus_flavor_t flavor); int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); char *networkstatus_get_detached_signatures(smartlist_t *consensuses); void ns_detached_signatures_free(ns_detached_signatures_t *s); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 8fd9428..873d761 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1207,9 +1207,11 @@ test_dir_v3_networkstatus(void) /* Try adding it to con2. */ detached_text2 = get_detached_sigs(con2,con_md2); - test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &msg)); + test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, "test", + LOG_INFO, &msg)); tor_free(detached_text2); - test_eq(1, networkstatus_add_detached_signatures(con_md2, dsig1, &msg)); + test_eq(1, networkstatus_add_detached_signatures(con_md2, dsig1, "test", + LOG_INFO, &msg)); tor_free(detached_text2); detached_text2 = get_detached_sigs(con2,con_md2); //printf("\n<%s>\n", detached_text2); @@ -1230,10 +1232,12 @@ test_dir_v3_networkstatus(void) "microdesc"))); /* Try adding to con2 twice; verify that nothing changes. */ - test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &msg)); + test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, "test", + LOG_INFO, &msg)); /* Add to con. */ - test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &msg)); + test_eq(2, networkstatus_add_detached_signatures(con, dsig2, "test", + LOG_INFO, &msg)); /* Check signatures */ voter = smartlist_get(con->voters, 1); sig = smartlist_get(voter->sigs, 0);

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit ecdea4eeafd921f0dcb053f2585d9cb05d6df658 Merge: 59d0a5a cc1580d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:17:16 2012 -0500 Merge branch 'maint-0.2.2' src/common/tortls.c | 5 +++++ src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/or/networkstatus.c | 25 ++++++++++++++++++------- src/test/test_dir.c | 12 ++++++++---- 5 files changed, 51 insertions(+), 15 deletions(-) diff --cc src/or/networkstatus.c index 7cd9d02,d5637b2..a835e78 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -484,8 -469,10 +484,10 @@@ networkstatus_check_consensus_signature int n_bad = 0; int n_unknown = 0; int n_no_signature = 0; - int n_v3_authorities = get_n_authorities(V3_AUTHORITY); + int n_v3_authorities = get_n_authorities(V3_DIRINFO); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create();

1 0

[tor/master] when the consensus fails, list which dir auths were in or out
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit cc1580dbe02f0f285fca65b7b388d99dbaf78f5c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:14:44 2012 -0500 when the consensus fails, list which dir auths were in or out --- src/or/networkstatus.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index b0ef74b..d5637b2 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -471,6 +471,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, int n_no_signature = 0; int n_v3_authorities = get_n_authorities(V3_AUTHORITY); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create(); @@ -521,11 +523,13 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, else if (sig->bad_signature) ++bad_here; } SMARTLIST_FOREACH_END(sig); - if (good_here) + + if (good_here) { ++n_good; - else if (bad_here) + smartlist_add(list_good, voter->nickname); + } else if (bad_here) { ++n_bad; - else if (missing_key_here) { + } else if (missing_key_here) { ++n_missing_key; if (dl_failed_key_here) ++n_dl_failed_key; @@ -533,6 +537,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, ++n_unknown; } else { ++n_no_signature; + smartlist_add(list_no_signature, voter->nickname); } } SMARTLIST_FOREACH_END(voter); @@ -580,13 +585,17 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, { smartlist_t *sl = smartlist_create(); char *cp; + char *tmp = smartlist_join_strings(list_good, " ", 0, NULL); tor_asprintf(&cp, "A consensus needs %d good signatures from recognized " - "authorities for us to accept it. This one has %d.", - n_required, n_good); + "authorities for us to accept it. This one has %d (%s).", + n_required, n_good, tmp); + tor_free(tmp); smartlist_add(sl,cp); if (n_no_signature) { - tor_asprintf(&cp, "%d of the authorities we know didn't sign it.", - n_no_signature); + tmp = smartlist_join_strings(list_no_signature, " ", 0, NULL); + tor_asprintf(&cp, "%d (%s) of the authorities we know didn't sign it.", + n_no_signature, tmp); + tor_free(tmp); smartlist_add(sl,cp); } if (n_unknown) { @@ -612,6 +621,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, } } + smartlist_free(list_good); + smartlist_free(list_no_signature); smartlist_free(unrecognized); smartlist_free(need_certs_from); smartlist_free(missing_authorities);

1 0

[tor/release-0.2.2] add a note from wanoskarnet
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 1416dd47a994fb9f3ff5108be8517270352c9699 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 09:03:03 2012 -0500 add a note from wanoskarnet he disagrees about what the code that we decided not to use would do --- src/common/tortls.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index ef61f71..37074de 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -781,6 +781,11 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, * with clients that are configured to use SSLv23_method(), so we should * probably never use it. */ + /* XXX wanoskarnet says this comment is bunk -- that even if we turn + * this line on, clients configured to use SSLv23 would still able to + * talk to us. But he also says it's ok to leave it out. I suggest we + * delete this whole clause (the one that's #if 0'ed out). I'll leave + * it in place until Nick expresses an opinion. -RD */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; #endif

1 0

[tor/release-0.2.2] tell me who votes are actually for, not just where they're from
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 78e95b7b713c15b40303d63b96dbf9a8070b6cf7 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 10:03:46 2012 -0500 tell me who votes are actually for, not just where they're from --- src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/test/test_dir.c | 12 ++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c6ce9f6..2fd94ea 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -35,10 +35,13 @@ typedef struct pending_consensus_t { static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, + const char *source, const char **msg_out); static int dirvote_add_signatures_to_pending_consensus( pending_consensus_t *pc, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); static char *list_v3_auth_ids(void); static void dirvote_fetch_missing_votes(void); @@ -2168,6 +2171,8 @@ networkstatus_compute_consensus(smartlist_t *votes, int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out) { int r = 0; @@ -2270,6 +2275,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target, if (sig->good_signature || !old_sig || old_sig->bad_signature) { log_info(LD_DIR, "Adding signature from %s with %s", voter_identity, algorithm); + log(severity, LD_DIR, "Added a signature for %s from %s.", + voter_identity, source); ++r; if (old_sig) { smartlist_remove(target_voter->sigs, old_sig); @@ -3198,7 +3205,8 @@ dirvote_compute_consensuses(void) SMARTLIST_FOREACH(pending_consensus_signature_list, char *, sig, { const char *msg = NULL; - int r = dirvote_add_signatures_to_all_pending_consensuses(sig, &msg); + int r = dirvote_add_signatures_to_all_pending_consensuses(sig, + "pending", &msg); if (r >= 0) n_sigs += r; else @@ -3240,6 +3248,8 @@ static int dirvote_add_signatures_to_pending_consensus( pending_consensus_t *pc, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out) { const char *flavor_name; @@ -3258,7 +3268,8 @@ dirvote_add_signatures_to_pending_consensus( log_info(LD_DIR, "Have %d signatures for adding to %s consensus.", sig_list ? smartlist_len(sig_list) : 0, flavor_name); } - r = networkstatus_add_detached_signatures(pc->consensus, sigs, msg_out); + r = networkstatus_add_detached_signatures(pc->consensus, sigs, + source, severity, msg_out); log_info(LD_DIR,"Added %d signatures to consensus.", r); if (r >= 1) { @@ -3307,6 +3318,7 @@ dirvote_add_signatures_to_pending_consensus( static int dirvote_add_signatures_to_all_pending_consensuses( const char *detached_signatures_body, + const char *source, const char **msg_out) { int r=0, i, n_added = 0, errors = 0; @@ -3323,10 +3335,12 @@ dirvote_add_signatures_to_all_pending_consensuses( for (i = 0; i < N_CONSENSUS_FLAVORS; ++i) { int res; + int severity = i == FLAV_NS ? LOG_NOTICE : LOG_INFO; pending_consensus_t *pc = &pending_consensuses[i]; if (!pc->consensus) continue; - res = dirvote_add_signatures_to_pending_consensus(pc, sigs, msg_out); + res = dirvote_add_signatures_to_pending_consensus(pc, sigs, source, + severity, msg_out); if (res < 0) errors++; else @@ -3373,7 +3387,7 @@ dirvote_add_signatures(const char *detached_signatures_body, log_notice(LD_DIR, "Got a signature from %s. " "Adding it to the pending consensus.", source); return dirvote_add_signatures_to_all_pending_consensuses( - detached_signatures_body, msg); + detached_signatures_body, source, msg); } else { log_notice(LD_DIR, "Got a signature from %s. " "Queuing it for the next consensus.", source); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index de11fcf..b8acd6a 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -31,6 +31,8 @@ char *networkstatus_compute_consensus(smartlist_t *votes, consensus_flavor_t flavor); int networkstatus_add_detached_signatures(networkstatus_t *target, ns_detached_signatures_t *sigs, + const char *source, + int severity, const char **msg_out); char *networkstatus_get_detached_signatures(smartlist_t *consensuses); void ns_detached_signatures_free(ns_detached_signatures_t *s); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 8fd9428..873d761 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1207,9 +1207,11 @@ test_dir_v3_networkstatus(void) /* Try adding it to con2. */ detached_text2 = get_detached_sigs(con2,con_md2); - test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &msg)); + test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, "test", + LOG_INFO, &msg)); tor_free(detached_text2); - test_eq(1, networkstatus_add_detached_signatures(con_md2, dsig1, &msg)); + test_eq(1, networkstatus_add_detached_signatures(con_md2, dsig1, "test", + LOG_INFO, &msg)); tor_free(detached_text2); detached_text2 = get_detached_sigs(con2,con_md2); //printf("\n<%s>\n", detached_text2); @@ -1230,10 +1232,12 @@ test_dir_v3_networkstatus(void) "microdesc"))); /* Try adding to con2 twice; verify that nothing changes. */ - test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &msg)); + test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, "test", + LOG_INFO, &msg)); /* Add to con. */ - test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &msg)); + test_eq(2, networkstatus_add_detached_signatures(con, dsig2, "test", + LOG_INFO, &msg)); /* Check signatures */ voter = smartlist_get(con->voters, 1); sig = smartlist_get(voter->sigs, 0);

1 0

[tor/release-0.2.2] nickname, not identity fingerprint, will help more
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 04bf17c50c111e80d715e984b5b3a4ad8feb5e81 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:09:01 2012 -0500 nickname, not identity fingerprint, will help more --- src/or/dirvote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 2fd94ea..ab08fd0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2276,7 +2276,7 @@ networkstatus_add_detached_signatures(networkstatus_t *target, log_info(LD_DIR, "Adding signature from %s with %s", voter_identity, algorithm); log(severity, LD_DIR, "Added a signature for %s from %s.", - voter_identity, source); + target_voter->nickname, source); ++r; if (old_sig) { smartlist_remove(target_voter->sigs, old_sig);

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 0a77d5324fe0686cdc70676361c1f90ff533f8fd Merge: 031ac2a cc1580d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:17:03 2012 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 src/common/tortls.c | 5 +++++ src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/or/networkstatus.c | 25 ++++++++++++++++++------- src/test/test_dir.c | 12 ++++++++---- 5 files changed, 51 insertions(+), 15 deletions(-)

1 0

[tor/release-0.2.2] when the consensus fails, list which dir auths were in or out
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit cc1580dbe02f0f285fca65b7b388d99dbaf78f5c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:14:44 2012 -0500 when the consensus fails, list which dir auths were in or out --- src/or/networkstatus.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index b0ef74b..d5637b2 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -471,6 +471,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, int n_no_signature = 0; int n_v3_authorities = get_n_authorities(V3_AUTHORITY); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create(); @@ -521,11 +523,13 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, else if (sig->bad_signature) ++bad_here; } SMARTLIST_FOREACH_END(sig); - if (good_here) + + if (good_here) { ++n_good; - else if (bad_here) + smartlist_add(list_good, voter->nickname); + } else if (bad_here) { ++n_bad; - else if (missing_key_here) { + } else if (missing_key_here) { ++n_missing_key; if (dl_failed_key_here) ++n_dl_failed_key; @@ -533,6 +537,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, ++n_unknown; } else { ++n_no_signature; + smartlist_add(list_no_signature, voter->nickname); } } SMARTLIST_FOREACH_END(voter); @@ -580,13 +585,17 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, { smartlist_t *sl = smartlist_create(); char *cp; + char *tmp = smartlist_join_strings(list_good, " ", 0, NULL); tor_asprintf(&cp, "A consensus needs %d good signatures from recognized " - "authorities for us to accept it. This one has %d.", - n_required, n_good); + "authorities for us to accept it. This one has %d (%s).", + n_required, n_good, tmp); + tor_free(tmp); smartlist_add(sl,cp); if (n_no_signature) { - tor_asprintf(&cp, "%d of the authorities we know didn't sign it.", - n_no_signature); + tmp = smartlist_join_strings(list_no_signature, " ", 0, NULL); + tor_asprintf(&cp, "%d (%s) of the authorities we know didn't sign it.", + n_no_signature, tmp); + tor_free(tmp); smartlist_add(sl,cp); } if (n_unknown) { @@ -612,6 +621,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, } } + smartlist_free(list_good); + smartlist_free(list_no_signature); smartlist_free(unrecognized); smartlist_free(need_certs_from); smartlist_free(missing_authorities);

1 0

[tor/maint-0.2.2] when the consensus fails, list which dir auths were in or out
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit cc1580dbe02f0f285fca65b7b388d99dbaf78f5c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:14:44 2012 -0500 when the consensus fails, list which dir auths were in or out --- src/or/networkstatus.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index b0ef74b..d5637b2 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -471,6 +471,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, int n_no_signature = 0; int n_v3_authorities = get_n_authorities(V3_AUTHORITY); int n_required = n_v3_authorities/2 + 1; + smartlist_t *list_good = smartlist_create(); + smartlist_t *list_no_signature = smartlist_create(); smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); smartlist_t *missing_authorities = smartlist_create(); @@ -521,11 +523,13 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, else if (sig->bad_signature) ++bad_here; } SMARTLIST_FOREACH_END(sig); - if (good_here) + + if (good_here) { ++n_good; - else if (bad_here) + smartlist_add(list_good, voter->nickname); + } else if (bad_here) { ++n_bad; - else if (missing_key_here) { + } else if (missing_key_here) { ++n_missing_key; if (dl_failed_key_here) ++n_dl_failed_key; @@ -533,6 +537,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, ++n_unknown; } else { ++n_no_signature; + smartlist_add(list_no_signature, voter->nickname); } } SMARTLIST_FOREACH_END(voter); @@ -580,13 +585,17 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, { smartlist_t *sl = smartlist_create(); char *cp; + char *tmp = smartlist_join_strings(list_good, " ", 0, NULL); tor_asprintf(&cp, "A consensus needs %d good signatures from recognized " - "authorities for us to accept it. This one has %d.", - n_required, n_good); + "authorities for us to accept it. This one has %d (%s).", + n_required, n_good, tmp); + tor_free(tmp); smartlist_add(sl,cp); if (n_no_signature) { - tor_asprintf(&cp, "%d of the authorities we know didn't sign it.", - n_no_signature); + tmp = smartlist_join_strings(list_no_signature, " ", 0, NULL); + tor_asprintf(&cp, "%d (%s) of the authorities we know didn't sign it.", + n_no_signature, tmp); + tor_free(tmp); smartlist_add(sl,cp); } if (n_unknown) { @@ -612,6 +621,8 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, } } + smartlist_free(list_good); + smartlist_free(list_no_signature); smartlist_free(unrecognized); smartlist_free(need_certs_from); smartlist_free(missing_authorities);

1 0

[tor/maint-0.2.2] nickname, not identity fingerprint, will help more
by arma＠torproject.org 08 Jan '12

08 Jan '12

commit 04bf17c50c111e80d715e984b5b3a4ad8feb5e81 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jan 8 12:09:01 2012 -0500 nickname, not identity fingerprint, will help more --- src/or/dirvote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 2fd94ea..ab08fd0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2276,7 +2276,7 @@ networkstatus_add_detached_signatures(networkstatus_t *target, log_info(LD_DIR, "Adding signature from %s with %s", voter_identity, algorithm); log(severity, LD_DIR, "Added a signature for %s from %s.", - voter_identity, source); + target_voter->nickname, source); ++r; if (old_sig) { smartlist_remove(target_voter->sigs, old_sig);

1 0