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

subtle change to avoid some false positives:

Browse Source 
if a server went down for six hours and then came back, we would
complain to it that it's unreachable. now we wait until the third
consecutive descriptor post that we thought it was unreachable,
before complaining to it.


svn:r4891
This commit is contained in:
Roger Dingledine 2005-09-01 08:13:40 +00:00
parent 3b6ab71929
commit 1b04f38145
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/dirserv.c
View File

@ -1290,6 +1290,7 @@ dirserv_orconn_tls_done(const char *address,
} else { /* correct nickname and digest. mark this router reachable! */ } else { /* correct nickname and digest. mark this router reachable! */
log_fn(LOG_INFO,"Found router %s to be reachable. Yay.", ri->nickname); log_fn(LOG_INFO,"Found router %s to be reachable. Yay.", ri->nickname);
ri->last_reachable = time(NULL); ri->last_reachable = time(NULL);
ri->num_unreachable_notifications = 0;
} }
} }
} }

9
src/or/or.h
View File

@ -750,8 +750,13 @@ typedef struct {
/* The below items are used only by authdirservers for /* The below items are used only by authdirservers for
* reachability testing. */ * reachability testing. */
time_t last_reachable; /**< When was the last time we could reach this OR? */ /** When was the last time we could reach this OR? */
time_t testing_since; /**< When did we start testing reachability for this OR? */ time_t last_reachable;
/** When did we start testing reachability for this OR? */
time_t testing_since;
/** How many times has a descriptor been posted and we believed
* this router to be unreachable? We only actually warn on the third. */
int num_unreachable_notifications;
} routerinfo_t; } routerinfo_t;
/** Contents of a running-routers list */ /** Contents of a running-routers list */

21
src/or/routerlist.c
View File

@ -912,7 +912,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg)
*msg = "Router descriptor was not new."; *msg = "Router descriptor was not new.";
return -1; return -1;
} else { } else {
int unreachable; int unreachable = 0;
log_fn(LOG_DEBUG, "Replacing entry for router '%s/%s' [%s]", log_fn(LOG_DEBUG, "Replacing entry for router '%s/%s' [%s]",
router->nickname, old_router->nickname, router->nickname, old_router->nickname,
hex_str(id_digest,DIGEST_LEN)); hex_str(id_digest,DIGEST_LEN));
@ -921,13 +921,20 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg)
/* these carry over when the address and orport are unchanged.*/ /* these carry over when the address and orport are unchanged.*/
router->last_reachable = old_router->last_reachable; router->last_reachable = old_router->last_reachable;
router->testing_since = old_router->testing_since; router->testing_since = old_router->testing_since;
router->num_unreachable_notifications =
old_router->num_unreachable_notifications;
} }
unreachable = authdir && if (authdir &&
dirserv_thinks_router_is_blatantly_unreachable(router, time(NULL)); dirserv_thinks_router_is_blatantly_unreachable(router, time(NULL))) {
if (unreachable) { if (router->num_unreachable_notifications >= 3) {
log_fn(LOG_WARN, "Notifying server '%s' that it's unreachable. (ContactInfo '%s', platform '%s').", unreachable = 1;
router->nickname, router->contact_info ? router->contact_info : "", log_fn(LOG_WARN, "Notifying server '%s' that it's unreachable. (ContactInfo '%s', platform '%s').",
router->platform ? router->platform : ""); router->nickname, router->contact_info ? router->contact_info : "",
router->platform ? router->platform : "");
} else {
log_fn(LOG_NOTICE,"'%s' may be unreachable -- the %d previous descriptors were thought to be unreachable.", router->nickname, router->num_unreachable_notifications);
router->num_unreachable_notifications++;
}
} }
routerinfo_free(old_router); routerinfo_free(old_router);
smartlist_set(routerlist->routers, i, router); smartlist_set(routerlist->routers, i, router);