nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only warn about lack of name binding for self if we have tried downloading every networkstatus.

Browse Source 
svn:r6172
This commit is contained in:
Nick Mathewson 2006-03-17 04:41:57 +00:00
parent 9a5df4cef5
commit 215e377224
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/routerlist.c
View File

@ -33,6 +33,7 @@ static void update_networkstatus_cache_downloads(time_t now);
static void update_networkstatus_client_downloads(time_t now); static void update_networkstatus_client_downloads(time_t now);
static int signed_desc_digest_is_recognized(signed_descriptor_t *desc); static int signed_desc_digest_is_recognized(signed_descriptor_t *desc);
static void routerlist_assert_ok(routerlist_t *rl); static void routerlist_assert_ok(routerlist_t *rl);
static int have_tried_downloading_all_statuses(void);
#define MAX_DESCRIPTORS_PER_ROUTER 5 #define MAX_DESCRIPTORS_PER_ROUTER 5
@ -2815,7 +2816,7 @@ routers_update_all_from_networkstatus(void)
"consider sending your identity fingerprint to the tor-ops.", "consider sending your identity fingerprint to the tor-ops.",
n_recent-n_valid, n_recent); n_recent-n_valid, n_recent);
have_warned_about_unverified_status = 1; have_warned_about_unverified_status = 1;
} else if (!n_named && n_naming) { // (n_named <= n_recent/2) { } else if (!n_named && have_tried_downloading_all_statuses()) {
log_warn(LD_GENERAL, "0/%d name-binding directory authorities " log_warn(LD_GENERAL, "0/%d name-binding directory authorities "
"recognize this server. Please consider sending your " "recognize this server. Please consider sending your "
"identity fingerprint to the tor-ops.", "identity fingerprint to the tor-ops.",
@ -3691,6 +3692,26 @@ router_have_minimum_dir_info(void)
return res; return res;
} }
/** Return true iff we have downloaded, or attempted to download, a network
* status for each authority. */
static int
have_tried_downloading_all_statuses(void)
{
if (!trusted_dir_servers)
return 0;
SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ds,
{
/* If we don't have the status, and we haven't failed to get the status,
* we haven't tried to get the status. */
if (!networkstatus_get_by_digest(ds->digest) &&
!ds->n_networkstatus_failures)
return 0;
});
return 1;
}
/** Reset the descriptor download failure count on all routers, so that we /** Reset the descriptor download failure count on all routers, so that we
* can retry any long-failed routers immediately. * can retry any long-failed routers immediately.
*/ */