Only check versions from versioning authdirs.

svn:r5101
This commit is contained in:
Nick Mathewson 2005-09-21 02:38:51 +00:00
parent 20b9111266
commit 72915546cd
2 changed files with 4 additions and 5 deletions

View File

@ -2042,8 +2042,8 @@ routers_update_all_from_networkstatus(void)
SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
{
version_status_t vs;
if (ns->received_on + SELF_OPINION_INTERVAL < now )
// XXXX NM enable this! || !ns->recommends_versions)
if (!ns->recommends_versions ||
ns->received_on + SELF_OPINION_INTERVAL < now )
continue;
vs = tor_version_is_obsolete(
VERSION, is_server ? ns->server_versions : ns->client_versions);
@ -2070,7 +2070,7 @@ routers_update_all_from_networkstatus(void)
have_warned_about_old_version = 1;
}
} else {
log_fn(LOG_NOTICE, "%d/%d recent directories think my version is ok.",
log_fn(LOG_INFO, "%d/%d recent directories think my version is ok.",
n_recommended, n_recent);
}
}

View File

@ -1077,7 +1077,6 @@ networkstatus_parse_from_string(const char *s)
log_fn(LOG_WARN, "Couldn't find network-status-version keyword");
goto err;
}
/* XXXX011 do something with the version! NM */
if (!(tok = find_first_by_keyword(tokens, K_DIR_SOURCE))) {
log_fn(LOG_WARN, "Couldn't find dir-source keyword");
@ -1144,7 +1143,7 @@ networkstatus_parse_from_string(const char *s)
}
}
if (ns->recommends_versions || 1) { //XXXX NM re-enable conditional.
if (ns->recommends_versions) {
if (!(tok = find_first_by_keyword(tokens, K_CLIENT_VERSIONS)) ||
tok->n_args<1) {
log_fn(LOG_WARN, "Missing client-versions");