mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 05:26:20 +02:00
Only check versions from versioning authdirs.
svn:r5101
This commit is contained in:
parent
20b9111266
commit
72915546cd
@ -2042,8 +2042,8 @@ routers_update_all_from_networkstatus(void)
|
|||||||
SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
|
SMARTLIST_FOREACH(networkstatus_list, networkstatus_t *, ns,
|
||||||
{
|
{
|
||||||
version_status_t vs;
|
version_status_t vs;
|
||||||
if (ns->received_on + SELF_OPINION_INTERVAL < now )
|
if (!ns->recommends_versions ||
|
||||||
// XXXX NM enable this! || !ns->recommends_versions)
|
ns->received_on + SELF_OPINION_INTERVAL < now )
|
||||||
continue;
|
continue;
|
||||||
vs = tor_version_is_obsolete(
|
vs = tor_version_is_obsolete(
|
||||||
VERSION, is_server ? ns->server_versions : ns->client_versions);
|
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;
|
have_warned_about_old_version = 1;
|
||||||
}
|
}
|
||||||
} else {
|
} 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);
|
n_recommended, n_recent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1077,7 +1077,6 @@ networkstatus_parse_from_string(const char *s)
|
|||||||
log_fn(LOG_WARN, "Couldn't find network-status-version keyword");
|
log_fn(LOG_WARN, "Couldn't find network-status-version keyword");
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
/* XXXX011 do something with the version! NM */
|
|
||||||
|
|
||||||
if (!(tok = find_first_by_keyword(tokens, K_DIR_SOURCE))) {
|
if (!(tok = find_first_by_keyword(tokens, K_DIR_SOURCE))) {
|
||||||
log_fn(LOG_WARN, "Couldn't find dir-source keyword");
|
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)) ||
|
if (!(tok = find_first_by_keyword(tokens, K_CLIENT_VERSIONS)) ||
|
||||||
tok->n_args<1) {
|
tok->n_args<1) {
|
||||||
log_fn(LOG_WARN, "Missing client-versions");
|
log_fn(LOG_WARN, "Missing client-versions");
|
||||||
|
Loading…
Reference in New Issue
Block a user