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

Add some braces to make arma happy

Browse Source
This commit is contained in:
Nick Mathewson 2010-08-18 11:28:51 -04:00
parent 4c94192033
commit 5063a1c538
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/dirserv.c
View File

@ -935,21 +935,22 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now)
*/ */
int answer; int answer;
if (router_is_me(router)) if (router_is_me(router)) {
/* 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 > 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;
else if (get_options()->AssumeReachable) } else if (get_options()->AssumeReachable) {
/* If AssumeReachable, everybody is up! */ /* If AssumeReachable, everybody is up! */
answer = 1; answer = 1;
else } else {
/* Otherwise, a router counts as up if we found it reachable in the last /* Otherwise, a router counts as up if we found it reachable in the last
REACHABLE_TIMEOUT seconds. */ REACHABLE_TIMEOUT seconds. */
answer = (now < router->last_reachable + REACHABLE_TIMEOUT); answer = (now < router->last_reachable + REACHABLE_TIMEOUT);
}
if (!answer && running_long_enough_to_decide_unreachable()) { if (!answer && running_long_enough_to_decide_unreachable()) {
/* not considered reachable. tell rephist. */ /* not considered reachable. tell rephist. */