[or-cvs] r17535: {tor} Add a new status event for consensus arrival (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-12-09 13:16:41 -0500 (Tue, 09 Dec 2008)
New Revision: 17535

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/networkstatus.c
Log:
Add a new status event for consensus arrival

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-12-09 17:47:26 UTC (rev 17534)
+++ tor/trunk/ChangeLog	2008-12-09 18:16:41 UTC (rev 17535)
@@ -1,3 +1,8 @@
+Changes in version 0.2.1.9-alpha - 200?-??-??
+
+  o Minor features (controller):
+    - New CONSENSUS_ARRIVED event 
+
 Changes in version 0.2.1.8-alpha - 2008-12-08
   o Major features:
     - New DirPortFrontPage option that takes an html file and publishes

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2008-12-09 17:47:26 UTC (rev 17534)
+++ tor/trunk/src/or/networkstatus.c	2008-12-09 18:16:41 UTC (rev 17535)
@@ -1359,6 +1359,11 @@
  * <b>consensus</b>.  If we don't have enough certificates to validate it,
  * store it in consensus_waiting_for_certs and launch a certificate fetch.
  *
+ * If flags & NSSET_FROM_CACHE, this networkstatus has come from the disk
+ * cache.  If flags & NSSET_WAS_WAITING_FOR_CERTS, this networkstatus was
+ * already received, but we were waiting for certificates on it.  If flags &
+ * NSSET_DONT_DOWNLOAD_CERTS, do not launch certificate downloads as needed.
+ *
  * Return 0 on success, <0 on failure.  On failure, caller should increment
  * the failure count as appropriate.
  *
@@ -1448,6 +1453,9 @@
     }
   }
 
+  if (!from_cache)
+    control_event_client_status(LOG_NOTICE, "CONSENSUS_ARRIVED");
+
   /* Are we missing any certificates at all? */
   if (r != 1 && dl_certs)
     authority_certs_fetch_missing(c, now);