diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-20 13:33:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-20 13:33:57 -0400 |
| commit | 1411842933afba657599dd1cccbc61040dfe9b4b (patch) | |
| tree | 3501c3c71b24281d7970a56df12a6d9708070edb /src/or/networkstatus.c | |
| parent | ff5ffd17760379612b1204fa4de9ab1e6980aac9 (diff) | |
| download | tor-1411842933afba657599dd1cccbc61040dfe9b4b.tar.gz tor-1411842933afba657599dd1cccbc61040dfe9b4b.zip | |
Count unknown authorities as unknown only once, not once per signature.
Do not double-report signatures from unrecognized authorities both as
"from unknown authority" and "not present". Fixes bug 1956, bugfix on
0.2.2.16-alpha.
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 9bb5546d97..1d8a20be11 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -482,6 +482,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, voter) { int good_here = 0; int bad_here = 0; + int unknown_here = 0; int missing_key_here = 0, dl_failed_key_here = 0; SMARTLIST_FOREACH_BEGIN(voter->sigs, document_signature_t *, sig) { if (!sig->good_signature && !sig->bad_signature && @@ -497,7 +498,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, if (!is_v3_auth) { smartlist_add(unrecognized, voter); - ++n_unknown; + ++unknown_here; continue; } else if (!cert || cert->expires < now) { smartlist_add(need_certs_from, voter); @@ -527,8 +528,11 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, ++n_missing_key; if (dl_failed_key_here) ++n_dl_failed_key; - } else + } else if (unknown_here) { + ++n_unknown; + } else { ++n_no_signature; + } } SMARTLIST_FOREACH_END(voter); /* Now see whether we're missing any voters entirely. */ |