nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 44: on HUP, if descriptor building fails (say, because router_get_my_address() fails), use old descriptor and warn.

Browse Source 
svn:r3839
This commit is contained in:
Nick Mathewson 2005-03-23 20:28:40 +00:00
parent 6e4bccc4ac
commit 4ee6addf57
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/or/main.c
View File

@ -965,16 +965,23 @@ static int do_hup(void) {
/* Fetch a new directory. Even authdirservers do this. */ /* Fetch a new directory. Even authdirservers do this. */
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1); directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
if (server_mode(options)) { if (server_mode(options)) {
const char *descriptor;
/* Restart cpuworker and dnsworker processes, so they get up-to-date /* Restart cpuworker and dnsworker processes, so they get up-to-date
* configuration options. */ * configuration options. */
cpuworkers_rotate(); cpuworkers_rotate();
dnsworkers_rotate(); dnsworkers_rotate();
/* Rebuild fresh descriptor. */ /* Rebuild fresh descriptor, but leave old one on failure. */
router_rebuild_descriptor(1); router_rebuild_descriptor(1);
tor_snprintf(keydir,sizeof(keydir),"%s/router.desc", options->DataDirectory); descriptor = router_get_my_descriptor();
if (!descriptor) {
log_fn(LOG_WARN,"No descriptor to save.");
return 0;
}
tor_snprintf(keydir,sizeof(keydir),"%s/router.desc",
options->DataDirectory);
log_fn(LOG_INFO,"Saving descriptor to %s...",keydir); log_fn(LOG_INFO,"Saving descriptor to %s...",keydir);
if (write_str_to_file(keydir, router_get_my_descriptor(), 0)) { if (write_str_to_file(keydir, descriptor, 0)) {
return -1; return 0;
} }
} }
return 0; return 0;