[or-cvs] Note the two places where clients will still try to fetch o...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv7548/src/or

Modified Files:
	circuituse.c main.c 
Log Message:
Note the two places where clients will still try to fetch old-style (v1) directory info.  These should be fixed, I think.

Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- circuituse.c	4 Oct 2005 22:23:31 -0000	1.82
+++ circuituse.c	5 Oct 2005 02:25:59 -0000	1.83
@@ -870,7 +870,8 @@
   if (!has_fetched_directory) {
     if (!connection_get_by_type(CONN_TYPE_DIR)) {
       log(LOG_NOTICE,"Application request when we're believed to be offline. Optimistically trying again.");
-      directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
+      /* XXXX011 NM This should be a generic "retry all directory fetches". */
+      directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /*XXXX011NM*/
     }
     /* the stream will be dealt with when has_fetched_directory becomes
      * 1, or when all directory attempts fail and directory_all_unreachable()

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -d -r1.569 -r1.570
--- main.c	5 Oct 2005 02:20:45 -0000	1.569
+++ main.c	5 Oct 2005 02:25:59 -0000	1.570
@@ -946,8 +946,8 @@
       log_fn(LOG_NOTICE, "Error reloading fingerprints. Continuing with old list.");
     }
   }
-  /* Fetch a new directory. Even authdirservers do this. */
-  directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
+  /* XXXX011 NM This should be a generic "retry all directory fetches". */
+  directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); /*XXXX011NM*/
   if (server_mode(options)) {
     const char *descriptor;
     /* Restart cpuworker and dnsworker processes, so they get up-to-date