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

We screwed up in anticipating how to add new dirservers:

Browse Source 
Old servers won't realize they're supposed to stay connected
to the new dirservers, so they'll expire connections to them,
but that means the dirservers will list them as unreachable.

So the fix is to stop requiring an open connection when deciding
if a server is reachable. This makes us slightly less accurate,
but at least it will work.


svn:r6140
This commit is contained in:
Roger Dingledine 2006-03-12 20:57:52 +00:00
parent ef447507ff
commit 1fc5eb329b
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/or/dirserv.c
View File

@ -694,19 +694,14 @@ list_single_server_status(routerinfo_t *desc, int is_live)
/** Treat a router as alive if /** Treat a router as alive if
* - It's me, and I'm not hibernating. * - It's me, and I'm not hibernating.
* or - we're connected to it and we've found it reachable recently. */ * or - We've found it reachable recently. */
static int static int
dirserv_thinks_router_is_reachable(routerinfo_t *router, time_t now) dirserv_thinks_router_is_reachable(routerinfo_t *router, time_t now)
{ {
connection_t *conn;
if (router_is_me(router) && !we_are_hibernating()) if (router_is_me(router) && !we_are_hibernating())
return 1; return 1;
conn = connection_or_get_by_identity_digest( return get_options()->AssumeReachable ||
router->cache_info.identity_digest); now < router->last_reachable + REACHABLE_TIMEOUT;
if (conn && conn->state == OR_CONN_STATE_OPEN)
return get_options()->AssumeReachable ||
now < router->last_reachable + REACHABLE_TIMEOUT;
return 0;
} }
/** Return 1 if we're confident that there's a problem with /** Return 1 if we're confident that there's a problem with
@ -716,13 +711,9 @@ int
dirserv_thinks_router_is_blatantly_unreachable(routerinfo_t *router, dirserv_thinks_router_is_blatantly_unreachable(routerinfo_t *router,
time_t now) time_t now)
{ {
connection_t *conn;
if (router->is_hibernating) if (router->is_hibernating)
return 0; return 0;
conn = connection_or_get_by_identity_digest( if (now >= router->last_reachable + 2*REACHABLE_TIMEOUT &&
router->cache_info.identity_digest);
if (conn && conn->state == OR_CONN_STATE_OPEN &&
now >= router->last_reachable + 2*REACHABLE_TIMEOUT &&
router->testing_since && router->testing_since &&
now >= router->testing_since + 2*REACHABLE_TIMEOUT) now >= router->testing_since + 2*REACHABLE_TIMEOUT)
return 1; return 1;