[or-cvs] r9617: Fix doc about when circuit_build_needed_circs() is called. R (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-02-22 02:41:14 -0500 (Thu, 22 Feb 2007)
New Revision: 9617

Modified:
   tor/trunk/
   tor/trunk/src/or/circuituse.c
Log:
 r11877 at catbus:  nickm | 2007-02-22 02:24:50 -0500
 Fix doc about when circuit_build_needed_circs() is called. Resolves another xxxx012.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11877] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2007-02-22 07:41:10 UTC (rev 9616)
+++ tor/trunk/src/or/circuituse.c	2007-02-22 07:41:14 UTC (rev 9617)
@@ -431,10 +431,10 @@
 /** Build a new test circuit every 5 minutes */
 #define TESTING_CIRCUIT_INTERVAL 300
 
-/** This function is called once a second. Its job is to make sure
- * all services we offer have enough circuits available. Some
- * services just want enough circuits for current tasks, whereas
- * others want a minimum set of idle circuits hanging around.
+/** This function is called once a second, if router_have_min_dir_info() is
+ * true. Its job is to make sure all services we offer have enough circuits
+ * available. Some services just want enough circuits for current tasks,
+ * whereas others want a minimum set of idle circuits hanging around.
  */
 void
 circuit_build_needed_circs(time_t now)
@@ -445,11 +445,7 @@
   connection_ap_attach_pending();
 
   /* make sure any hidden services have enough intro points */
-  /* XXXX012 circuit_build_needed_circs is only called at all if
-   *         router_have_minimum_dir_info is true; this check is redundant,
-   *         and it appears to show up on some people's profiles. */
-  if (1 || router_have_minimum_dir_info())
-    rend_services_introduce();
+  rend_services_introduce();
 
   if (time_to_new_circuit < now) {
     circuit_reset_failure_count(1);