[or-cvs] actually listen when we try to route our dir connection via...

[arma@xxxxxxxx]

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

Modified Files:
	directory.c 
Log Message:
actually listen when we try to route our dir connection via tor.


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- directory.c	19 Nov 2005 10:12:10 -0000	1.320
+++ directory.c	19 Nov 2005 10:33:34 -0000	1.321
@@ -163,7 +163,6 @@
   or_options_t *options = get_options();
   int fetch_fresh_first = server_mode(options) && options->DirPort != 0;
   int directconn = !purpose_is_private(purpose);
-  int need_to_use_tor = 0;
 
   int need_v1_support = purpose == DIR_PURPOSE_FETCH_DIR ||
                         purpose == DIR_PURPOSE_FETCH_RUNNING_LIST;
@@ -202,11 +201,11 @@
         ds = router_pick_trusteddirserver(1, 1, 1,
                                           retry_if_no_servers);
         if (!ds)
-          need_to_use_tor = 1; /* last resort: try routing it via Tor */
+          directconn = 0; /* last resort: try routing it via Tor */
       }
     }
   }
-  if (!directconn || need_to_use_tor) {
+  if (!directconn) {
     /* Never use fascistfirewall; we're going via Tor. */
     if (purpose == DIR_PURPOSE_FETCH_RENDDESC) {
       /* only ask authdirservers, any of them will do */
@@ -228,7 +227,7 @@
     notice(LD_DIR,
            "No running dirservers known. Will try again later. (purpose %d)",
            purpose);
-    if (directconn) {
+    if (!purpose_is_private(purpose)) {
       /* remember we tried them all and failed. */
       directory_all_unreachable(time(NULL));
     }