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

r9736@danube: weasel | 2006-09-14 05:53:06 +0200

Browse Source 
Refactor dirserv_parse_fingerprint_file(fname) into dirserv_load_fingerprint_file():
 There is not need to put together the path to the approved-routers file in more than one place.


svn:r8386
This commit is contained in:
Peter Palfrader 2006-09-14 04:53:23 +00:00
parent 7f1fa9aab5
commit 984e8f6efb
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/dirserv.c
View File

@ -122,24 +122,31 @@ dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk)
return 0; return 0;
} }
/** Parse the nickname-\>fingerprint mappings stored in the file named /** Load the nickname-\>fingerprint mappings stored in the approved-routers
* <b>fname</b>. The file format is line-based, with each non-blank * file. The file format is line-based, with each non-blank holding one
* holding one nickname, some space, and a fingerprint for that * nickname, some space, and a fingerprint for that nickname. On success,
* nickname. On success, replace the current fingerprint list with * replace the current fingerprint list with the new list and return 0. On
* the contents of <b>fname</b> and return 0. On failure, leave the * failure, leave the current fingerprint list untouched, and
* current fingerprint list untouched, and return -1. */ * return -1. */
int int
dirserv_parse_fingerprint_file(const char *fname) dirserv_load_fingerprint_file()
{ {
char fname[512];
char *cf; char *cf;
char *nickname, *fingerprint; char *nickname, *fingerprint;
smartlist_t *fingerprint_list_new; smartlist_t *fingerprint_list_new;
int result; int result;
config_line_t *front=NULL, *list; config_line_t *front=NULL, *list;
or_options_t *options = get_options();
tor_snprintf(fname, sizeof(fname),
"%s/approved-routers", options->DataDirectory);
log_info(LD_GENERAL,
"Reloading approved fingerprints from \"%s\"...", fname);
cf = read_file_to_str(fname, 0); cf = read_file_to_str(fname, 0);
if (!cf) { if (!cf) {
if (get_options()->NamingAuthoritativeDir) { if (options->NamingAuthoritativeDir) {
log_warn(LD_FS, "Cannot open fingerprint file '%s'. Failing.", fname); log_warn(LD_FS, "Cannot open fingerprint file '%s'. Failing.", fname);
return -1; return -1;
} else { } else {

8
src/or/main.c
View File

@ -1036,7 +1036,6 @@ got_libevent_error(void)
static int static int
do_hup(void) do_hup(void)
{ {
char keydir[512];
or_options_t *options = get_options(); or_options_t *options = get_options();
log_notice(LD_GENERAL,"Received reload signal (hup). Reloading config."); log_notice(LD_GENERAL,"Received reload signal (hup). Reloading config.");
@ -1056,11 +1055,8 @@ do_hup(void)
options = get_options(); /* they have changed now */ options = get_options(); /* they have changed now */
if (authdir_mode(options)) { if (authdir_mode(options)) {
/* reload the approved-routers file */ /* reload the approved-routers file */
tor_snprintf(keydir, sizeof(keydir), if (dirserv_load_fingerprint_file() < 0) {
"%s/approved-routers", options->DataDirectory); /* warnings are logged from dirserv_load_fingerprint_file() directly */
log_info(LD_GENERAL,
"Reloading approved fingerprints from \"%s\"...", keydir);
if (dirserv_parse_fingerprint_file(keydir) < 0) {
log_info(LD_GENERAL, "Error reloading fingerprints. " log_info(LD_GENERAL, "Error reloading fingerprints. "
"Continuing with old list."); "Continuing with old list.");
} }

2
src/or/or.h
View File

@ -2095,7 +2095,7 @@ char *directory_dump_request_log(void);
int connection_dirserv_flushed_some(dir_connection_t *conn); int connection_dirserv_flushed_some(dir_connection_t *conn);
int dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk); int dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk);
int dirserv_parse_fingerprint_file(const char *fname); int dirserv_load_fingerprint_file();
void dirserv_free_fingerprint_list(void); void dirserv_free_fingerprint_list(void);
const char *dirserv_get_nickname_by_digest(const char *digest); const char *dirserv_get_nickname_by_digest(const char *digest);
int dirserv_add_descriptor(const char *desc, const char **msg); int dirserv_add_descriptor(const char *desc, const char **msg);

4
src/or/router.c
View File

@ -353,9 +353,7 @@ init_keys(void)
if (!authdir_mode(options)) if (!authdir_mode(options))
return 0; return 0;
/* 6. [authdirserver only] load approved-routers file */ /* 6. [authdirserver only] load approved-routers file */
tor_snprintf(keydir,sizeof(keydir),"%s/approved-routers", datadir); if (dirserv_load_fingerprint_file() < 0) {
log_info(LD_DIRSERV,"Loading approved fingerprints from \"%s\"...",keydir);
if (dirserv_parse_fingerprint_file(keydir) < 0) {
log_err(LD_GENERAL,"Error loading fingerprints"); log_err(LD_GENERAL,"Error loading fingerprints");
return -1; return -1;
} }