[or-cvs] r15443: Send a bootstrap problem "warn" event on the first problem i (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-24 04:00:30 -0400 (Tue, 24 Jun 2008)
New Revision: 15443

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
   tor/trunk/src/or/directory.c
Log:
Send a bootstrap problem "warn" event on the first problem if the
reason is NO_ROUTE (that is, our network is down).


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-06-24 07:40:46 UTC (rev 15442)
+++ tor/trunk/ChangeLog	2008-06-24 08:00:30 UTC (rev 15443)
@@ -1,4 +1,8 @@
 Changes in version 0.2.1.3-alpha - 2008-06-xx
+  o Bootstrapping bugfixes (on 0.2.1.x-alpha):
+    - Send a bootstrap problem "warn" event on the first problem if the
+      reason is NO_ROUTE (that is, our network is down).
+
   o Minor bugfixes:
     - Change the contrib/tor.logrotate script so it makes the new
       logs as "_tor:_tor" rather than the default, which is generally

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-06-24 07:40:46 UTC (rev 15442)
+++ tor/trunk/src/or/control.c	2008-06-24 08:00:30 UTC (rev 15443)
@@ -3828,8 +3828,8 @@
   if (status > bootstrap_percent ||
       (progress && progress > bootstrap_percent)) {
     bootstrap_status_to_string(status, &tag, &summary);
-    log_notice(LD_CONTROL, "Bootstrapped %d%%: %s.",
-               progress ? progress : status, summary);
+    log(status ? LOG_NOTICE : LOG_INFO, LD_CONTROL,
+        "Bootstrapped %d%%: %s.", progress ? progress : status, summary);
     tor_snprintf(buf, sizeof(buf),
         "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"",
         progress ? progress : status, tag, summary);
@@ -3868,6 +3868,9 @@
   if (bootstrap_problems >= BOOTSTRAP_PROBLEM_THRESHOLD)
     recommendation = "warn";
 
+  if (reason == END_OR_CONN_REASON_NO_ROUTE)
+    recommendation = "warn";
+
   if (get_options()->UseBridges &&
       !any_bridge_descriptors_known() &&
       !any_pending_bridge_descriptor_fetches())

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2008-06-24 07:40:46 UTC (rev 15442)
+++ tor/trunk/src/or/directory.c	2008-06-24 08:00:30 UTC (rev 15443)
@@ -588,7 +588,7 @@
    * it's not their fault. */
 
   /* No need to relaunch descriptor downloads here: we already do it
-   * every 10 seconds (DESCRIPTOR_RETRY_INTERVAL) in main.c. */
+   * every 10 or 60 seconds (FOO_DESCRIPTOR_RETRY_INTERVAL) in main.c. */
   tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
              conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO);