[or-cvs] r15180: backport r14998 (tor/branches/tor-0_2_0-patches/src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-13 00:07:29 -0400 (Fri, 13 Jun 2008)
New Revision: 15180

Modified:
   tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c
   tor/branches/tor-0_2_0-patches/src/or/routerlist.c
Log:
backport r14998


Modified: tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c	2008-06-13 03:52:58 UTC (rev 15179)
+++ tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c	2008-06-13 04:07:29 UTC (rev 15180)
@@ -1045,11 +1045,11 @@
       purpose != CIRCUIT_PURPOSE_S_ESTABLISH_INTRO)
     routelen++;
 
-  log_debug(LD_CIRC,"Chosen route length %d (%d routers available).",
-            routelen, smartlist_len(routers));
-
   num_acceptable_routers = count_acceptable_routers(routers);
 
+  log_debug(LD_CIRC,"Chosen route length %d (%d/%d routers available).",
+            routelen, num_acceptable_routers, smartlist_len(routers));
+
   if (num_acceptable_routers < 2) {
     log_info(LD_CIRC,
              "Not enough acceptable routers (%d). Discarding this circuit.",
@@ -1961,7 +1961,7 @@
     {
       tor_snprintf(buf, sizeof(buf), "%s (%s%s)",
                    e->nickname,
-                   e->bad_since ? "down " : "up ",
+                   entry_is_live(e, 0, 1, 0) ? "up " : "down ",
                    e->made_contact ? "made-contact" : "never-contacted");
       smartlist_add(elements, tor_strdup(buf));
     });

Modified: tor/branches/tor-0_2_0-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/routerlist.c	2008-06-13 03:52:58 UTC (rev 15179)
+++ tor/branches/tor-0_2_0-patches/src/or/routerlist.c	2008-06-13 04:07:29 UTC (rev 15180)
@@ -2683,8 +2683,8 @@
 
   router = router_get_by_digest(digest);
   if (router) {
-    log_debug(LD_DIR,"Marking router '%s' as %s.",
-              router->nickname, up ? "up" : "down");
+    log_debug(LD_DIR,"Marking router '%s/%s' as %s.",
+              router->nickname, router->address, up ? "up" : "down");
     if (!up && router_is_me(router) && !we_are_hibernating())
       log_warn(LD_NET, "We just marked ourself as down. Are your external "
                "addresses reachable?");
@@ -4189,9 +4189,7 @@
   }
   if (!res && have_min_dir_info) {
     log(LOG_NOTICE, LD_DIR,"Our directory information is no longer up-to-date "
-        "enough to build circuits.%s",
-        num_usable > 2 ? "" : " (Not enough servers seem reachable -- "
-        "is your network connection down?)");
+        "enough to build circuits: %s", dir_info_status);
     control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO");
   }
   have_min_dir_info = res;