nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow some skew in checking when a router said it was hibernating

Browse Source 
This solves the problem Roger noted as:
   What if the router has a clock that's 5 minutes off, so it
   publishes a descriptor for 5 minutes in the future, and we test it
   three minutes in. In this edge case, we will continue to advertise
   it as Running for the full 45 minute period.
This commit is contained in:
Nick Mathewson 2010-08-18 11:38:41 -04:00
parent a4c5287e1b
commit 23fdf0b30f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/dirserv.c
View File

@ -923,6 +923,11 @@ running_long_enough_to_decide_unreachable(void)
* the directory. */ * the directory. */
#define REACHABLE_TIMEOUT (45*60) #define REACHABLE_TIMEOUT (45*60)
/** If we tested a router and found it reachable _at least this long_ after it
* declared itself hibernating, it is probably done hibernating and we just
* missed a descriptor from it. */
#define ALLOW_REACHABILITY_PUBLICATION_SKEW (60*60)
/** 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've found it reachable recently. */ * or - We've found it reachable recently. */
@ -939,7 +944,8 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now)
/* We always know if we are down ourselves. */ /* We always know if we are down ourselves. */
answer = ! we_are_hibernating(); answer = ! we_are_hibernating();
} else if (router->is_hibernating && } else if (router->is_hibernating &&
router->cache_info.published_on > router->last_reachable) { (router->cache_info.published_on +
ALLOW_REACHABILITY_PUBLICATION_SKEW) > router->last_reachable) {
/* A hibernating router is down unless we (somehow) had contact with it /* A hibernating router is down unless we (somehow) had contact with it
* since it declared itself to be hibernating. */ * since it declared itself to be hibernating. */
answer = 0; answer = 0;