aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-08-18 11:28:51 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-18 11:28:51 -0400
commit5063a1c538739e56a38605b2d8ddba3164e1aa73 (patch)
treef5e77f838131430c19829c2b791b04f1dd4f2f7d
parent4c941920331ba17b4f245110f056cd60616c95b7 (diff)
downloadtor-5063a1c538739e56a38605b2d8ddba3164e1aa73.tar
tor-5063a1c538739e56a38605b2d8ddba3164e1aa73.tar.gz
Add some braces to make arma happy
-rw-r--r--src/or/dirserv.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7b469ce54..4d4d8a22c 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -935,21 +935,22 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now)
*/
int answer;
- if (router_is_me(router))
+ if (router_is_me(router)) {
/* We always know if we are down ourselves. */
answer = ! we_are_hibernating();
- else if (router->is_hibernating &&
- router->cache_info.published_on > router->last_reachable)
+ } else if (router->is_hibernating &&
+ router->cache_info.published_on > router->last_reachable) {
/* A hibernating router is down unless we (somehow) had contact with it
* since it declared itself to be hibernating. */
answer = 0;
- else if (get_options()->AssumeReachable)
+ } else if (get_options()->AssumeReachable) {
/* If AssumeReachable, everybody is up! */
answer = 1;
- else
+ } else {
/* Otherwise, a router counts as up if we found it reachable in the last
REACHABLE_TIMEOUT seconds. */
answer = (now < router->last_reachable + REACHABLE_TIMEOUT);
+ }
if (!answer && running_long_enough_to_decide_unreachable()) {
/* not considered reachable. tell rephist. */