Commit 25e7e97d authored by Roger Dingledine's avatar Roger Dingledine
Browse files

on HUP, retry OR connections, and stop clobbering the dirserver's routerlist 


svn:r920
parent 05c05d64

src/or/main.c

+3 −6
Original line number Diff line number Diff line
@@ -481,7 +481,9 @@ static int do_main_loop(void) { 
        /* 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 @@ static int do_main_loop(void) { 
        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);