diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-31 11:00:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-31 11:01:57 -0400 |
| commit | 063138e001d3608b1e8b6619661d906cfea74ae0 (patch) | |
| tree | 9cc1bbaecb1f1835bfab074646e266b282ea124f /src/or | |
| parent | 7143d112a69806bde4a29bf8da94704cfb435fe3 (diff) | |
| download | tor-063138e001d3608b1e8b6619661d906cfea74ae0.tar tor-063138e001d3608b1e8b6619661d906cfea74ae0.tar.gz | |
Warn at parse time for routerstatus entry missing a microdesc consensus
In 0.2.3.18-rc, we started warning on this case while building a
list of missing microdescriptor digests. That turned out to spam
the logs; instead let's warn at parse time.
Partial fix for bug 6404.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/microdesc.c | 7 | ||||
| -rw-r--r-- | src/or/routerparse.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 9395a9a05..c1ac1c375 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -643,13 +643,8 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, continue; if (skip && digestmap_get(skip, rs->descriptor_digest)) continue; - if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) { - log_info(LD_BUG, "Found an entry in networkstatus with no " - "microdescriptor digest. (Router %s=%s at %s:%d.)", - rs->nickname, hex_str(rs->identity_digest, DIGEST_LEN), - fmt_addr32(rs->addr), rs->or_port); + if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) continue; - } /* XXXX Also skip if we're a noncache and wouldn't use this router. * XXXX NM Microdesc */ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 4231a17c6..8b69ad1d1 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2201,6 +2201,11 @@ routerstatus_parse_entry_from_string(memarea_t *area, escaped(tok->args[0])); goto err; } + } else { + log_info(LD_BUG, "Found an entry in networkstatus with no " + "microdescriptor digest. (Router %s=%s at %s:%d.)", + rs->nickname, hex_str(rs->identity_digest, DIGEST_LEN), + fmt_addr32(rs->addr), rs->or_port); } } |