[or-cvs] don"t stop fetching server descriptors if we"re a server and

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	rephist.c 
Log Message:
don't stop fetching server descriptors if we're a server and
haven't found ourselves reachable yet.


Index: rephist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/rephist.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -d -r1.86 -r1.87
--- rephist.c	30 May 2006 06:19:06 -0000	1.86
+++ rephist.c	3 Jun 2006 02:56:44 -0000	1.87
@@ -918,8 +918,17 @@ rep_hist_get_predicted_internal(time_t n
 int
 rep_hist_circbuilding_dormant(void)
 {
+  /* Any ports used lately? These are pre-seeded if we just started
+   * up or if we're running a hidden service. */
   if (predicted_ports_list || predicted_internal_time)
-    return 0; /* nothing used lately. */
+    return 0;
+
+  /* see if we'll still need to build testing circuits */
+  if (server_mode(options) && !check_whether_orport_reachable())
+    return 0;
+  if (!check_whether_dirport_reachable())
+    return 0;
+
   return 1;
 }