nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
svn:r920
This commit is contained in:
Roger Dingledine 2003-12-14 04:33:18 +00:00
parent 05c05d6444
commit 25e7e97d73
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/main.c
View File

@ -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);