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

rearrange to prepare to solve the authdirserver initialization

Browse Source 
precedence problem. doesn't actually solve it yet.


svn:r2079
This commit is contained in:
Roger Dingledine 2004-07-21 07:50:06 +00:00
parent 2d514037b7
commit 3e97c12f24
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/main.c
View File

@ -763,13 +763,6 @@ static int do_main_loop(void) {
/* Intialize the service cache. */ /* Intialize the service cache. */
rend_cache_init(); rend_cache_init();
/* load the private keys, if we're supposed to have them, and set up the
* TLS context. */
if (init_keys() < 0 || rend_service_load_keys() < 0) {
log_fn(LOG_ERR,"Error initializing keys; exiting");
return -1;
}
/* load the routers file */ /* load the routers file */
if(options.RouterFile) { if(options.RouterFile) {
routerlist_clear_trusted_directories(); routerlist_clear_trusted_directories();
@ -779,6 +772,13 @@ static int do_main_loop(void) {
} }
} }
/* load the private keys, if we're supposed to have them, and set up the
* TLS context. */
if (init_keys() < 0 || rend_service_load_keys() < 0) {
log_fn(LOG_ERR,"Error initializing keys; exiting");
return -1;
}
if(authdir_mode()) { if(authdir_mode()) {
/* the directory is already here, run startup things */ /* the directory is already here, run startup things */
directory_has_arrived(); directory_has_arrived();

4
src/or/router.c
View File

@ -509,6 +509,8 @@ int router_rebuild_descriptor(void) {
ri->bandwidthburst = options.BandwidthBurst; ri->bandwidthburst = options.BandwidthBurst;
ri->exit_policy = NULL; /* zero it out first */ ri->exit_policy = NULL; /* zero it out first */
router_add_exit_policy_from_config(ri); router_add_exit_policy_from_config(ri);
ri->is_trusted_dir = (ri->dir_port &&
router_digest_is_trusted_dir(ri->identity_digest));
if (desc_routerinfo) if (desc_routerinfo)
routerinfo_free(desc_routerinfo); routerinfo_free(desc_routerinfo);
desc_routerinfo = ri; desc_routerinfo = ri;
@ -516,8 +518,6 @@ int router_rebuild_descriptor(void) {
log_fn(LOG_WARN, "Couldn't dump router to string."); log_fn(LOG_WARN, "Couldn't dump router to string.");
return -1; return -1;
} }
ri->is_trusted_dir = (ri->dir_port &&
router_digest_is_trusted_dir(ri->identity_digest));
return 0; return 0;
} }

1
src/or/routerlist.c
View File

@ -571,6 +571,7 @@ int router_load_routerlist_from_string(const char *s, int trusted)
routerinfo_t *r = smartlist_get(new_list->routers, i); routerinfo_t *r = smartlist_get(new_list->routers, i);
if (r->dir_port) { if (r->dir_port) {
char *b; char *b;
log_fn(LOG_DEBUG,"Trusting router %s.", r->nickname);
r->is_trusted_dir = 1; r->is_trusted_dir = 1;
b = tor_malloc(DIGEST_LEN); b = tor_malloc(DIGEST_LEN);
memcpy(b, r->identity_digest, DIGEST_LEN); memcpy(b, r->identity_digest, DIGEST_LEN);