sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport r10799 

svn:r10800
This commit is contained in:
Peter Palfrader 2007-07-12 15:58:03 +00:00
parent 0bea370d3c
commit f64a5b71e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/routerlist.c
View File

@ -1902,8 +1902,11 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
int authdir = get_options()->AuthoritativeDir;
int authdir_believes_valid = 0;
routerinfo_t *old_router;
/* This has side effects, so do it before we start the real work */
int have_dir_info = router_have_minimum_dir_info();
/* router_have_minimum_dir_info() has side effects, so do it before we
* start the real work */
int authdir_may_warn_about_unreachable_server =
authdir && !from_cache && !from_fetch &&
router_have_minimum_dir_info();
tor_assert(msg);
@ -1996,8 +1999,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
router->num_unreachable_notifications =
old_router->num_unreachable_notifications;
}
if (authdir && !from_cache && !from_fetch &&
have_dir_info &&
if (authdir_may_warn_about_unreachable_server &&
dirserv_thinks_router_is_blatantly_unreachable(router, time(NULL))) {
if (router->num_unreachable_notifications >= 3) {
unreachable = 1;