[or-cvs] r8604: bugfix: When testing reachability of our dirport, don't laun (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2006-10-06 00:02:27 -0400 (Fri, 06 Oct 2006)
New Revision: 8604

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:
bugfix: When testing reachability of our dirport, don't launch a new
test if there's already one in progress.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-10-06 03:39:38 UTC (rev 8603)
+++ tor/trunk/ChangeLog	2006-10-06 04:02:27 UTC (rev 8604)
@@ -85,6 +85,8 @@
       Previously, the server would give them no answer at all.
 
   o Minor Bugfixes:
+    - When testing reachability of our dirport, don't launch a new
+      test if there's already one in progress.
     - Two small performance improvements on parsing descriptors.
     - We were building exactly the wrong circuits when we anticipated
       hidden service requirements, meaning Tor would have to build all

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2006-10-06 03:39:38 UTC (rev 8603)
+++ tor/trunk/src/or/router.c	2006-10-06 04:02:27 UTC (rev 8604)
@@ -452,7 +452,10 @@
     circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, me, 0, 1, 1);
   }
 
-  if (test_dir && !check_whether_dirport_reachable()) {
+  if (test_dir && !check_whether_dirport_reachable() &&
+      !connection_get_by_type_addr_port_purpose(
+                CONN_TYPE_DIR, me->addr, me->dir_port,
+                DIR_PURPOSE_FETCH_SERVERDESC)) {
     /* ask myself, via tor, for my server descriptor. */
     directory_initiate_command_router(me, DIR_PURPOSE_FETCH_SERVERDESC,
                                       1, "authority", NULL, 0);