[or-cvs] on HUP, retry OR connections, and stop clobbering the dirse...

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	main.c 
Log Message:
on HUP, retry OR connections, and stop clobbering the dirserver's routerlist


Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- main.c	6 Dec 2003 05:54:04 -0000	1.155
+++ main.c	14 Dec 2003 04:33:18 -0000	1.156
@@ -481,7 +481,9 @@
         /* no need to provide argc/v, they've been cached inside init_from_config */
         exit(1);
       }
-
+      if(options.ORPort) {
+        router_retry_connections();
+      }
       if(options.DirPort) {
         /* reload the fingerprint file */
         char keydir[512];
@@ -490,11 +492,6 @@
         if(dirserv_parse_fingerprint_file(keydir) < 0) {
           log_fn(LOG_WARN, "Error reloading fingerprints. Continuing with old list.");
         }
-
-        /* XXX do we really want to be resetting the routerlist here? */
-        if(router_set_routerlist_from_file(options.RouterFile) < 0) {
-          log(LOG_WARN,"Error reloading router list. Continuing with old list.");
-        }
       } else {
         /* fetch a new directory */
         directory_initiate_command(router_pick_directory_server(), DIR_CONN_STATE_CONNECTING_FETCH);