[or-cvs] [tor/master 8/9] Tweak some issues found by arma in bug911 review.

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Tue, 14 Sep 2010 22:10:32 -0400
Subject: Tweak some issues found by arma in bug911 review.
Commit: d9e05505606046afa8b346acac5f1e379e6f6e6d

---
 src/or/dirserv.c       |    6 +++---
 src/or/networkstatus.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 523a921..8523335 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -930,7 +930,7 @@ running_long_enough_to_decide_unreachable(void)
 /** 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)
+#define HIBERNATION_PUBLICATION_SKEW (60*60)
 
 /** Treat a router as alive if
  *    - It's me, and I'm not hibernating.
@@ -949,7 +949,7 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now)
     answer = ! we_are_hibernating();
   } else if (router->is_hibernating &&
              (router->cache_info.published_on +
-              ALLOW_REACHABILITY_PUBLICATION_SKEW) > router->last_reachable) {
+              HIBERNATION_PUBLICATION_SKEW) > router->last_reachable) {
     /* A hibernating router is down unless we (somehow) had contact with it
      * since it declared itself to be hibernating. */
     answer = 0;
@@ -3126,7 +3126,7 @@ int
 dirserv_should_launch_reachability_test(routerinfo_t *ri, routerinfo_t *ri_old)
 {
   if (!authdir_mode_handles_descs(get_options(), ri->purpose))
-      return 0;
+    return 0;
   if (!ri_old) {
     /* New router: Launch an immediate reachability test, so we will have an
      * opinion soon in case we're generating a consensus soon */
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index bf034f4..2814f16 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1925,7 +1925,7 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers,
       router->is_bad_exit = rs->is_bad_exit;
       router->is_hs_dir = rs->is_hs_dir;
     } else {
-      /* If we _are_ an authority, we should check wither this router
+      /* If we _are_ an authority, we should check whether this router
        * is one that will cause us to need a reachability test. */
       routerinfo_t *old_router =
         router_get_by_digest(router->cache_info.identity_digest);
-- 
1.7.1