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

r13951@catbus: nickm | 2007-07-27 18:39:28 -0400

Browse Source 
Make it so we can actually compile with FULL_V1_DIRECTORIES disabled.


svn:r10952
This commit is contained in:
Nick Mathewson 2007-07-27 23:18:58 +00:00
parent f6229d6432
commit 43f64d09ea
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/or/dirserv.c
View File

@ -32,6 +32,13 @@ static int the_directory_is_dirty = 1;
static int runningrouters_is_dirty = 1;
static int the_v2_networkstatus_is_dirty = 1;
/** Most recently generated encoded signed v1 directory. (v1 auth dirservers
* only.) */
static cached_dir_t *the_directory = NULL;
/** For authoritative directories: the current (v1) network status. */
static cached_dir_t the_runningrouters = { NULL, NULL, 0, 0, 0, -1 };
static void directory_remove_invalid(void);
static cached_dir_t *dirserv_regenerate_directory(void);
static char *format_versions_list(config_line_t *ln);
@ -962,8 +969,12 @@ dirserv_dump_directory_to_string(char **dir_out,
char *buf = NULL;
size_t buf_len;
size_t identity_pkey_len;
routerlist_t *rl = router_get_routerlist();
time_t now = time(NULL);
#ifdef FULL_V1_DIRECTORIES
routerlist_t *rl = router_get_routerlist();
#else
(void)complete;
#endif
tor_assert(dir_out);
*dir_out = NULL;
@ -1059,10 +1070,6 @@ dirserv_dump_directory_to_string(char **dir_out,
return -1;
}
/** Most recently generated encoded signed v1 directory. (v1 auth dirservers
* only.) */
static cached_dir_t *the_directory = NULL;
/* Used only by non-v1-auth dirservers: The v1 directory and
* runningrouters we'll serve when requested. */
static cached_dir_t *cached_directory = NULL;
@ -1365,9 +1372,6 @@ dirserv_regenerate_directory(void)
return the_directory;
}
/** For authoritative directories: the current (v1) network status. */
static cached_dir_t the_runningrouters = { NULL, NULL, 0, 0, 0, -1 };
/** Only called by v1 auth dirservers.
* Replace the current running-routers list with a newly generated one. */
static cached_dir_t *
@ -1381,7 +1385,9 @@ generate_runningrouters(void)
crypto_pk_env_t *private_key = get_identity_key();
char *identity_pkey; /* Identity key, DER64-encoded. */
size_t identity_pkey_len;
#ifdef FULL_V1_DIRECTORIES
routerlist_t *rl = router_get_routerlist();
#endif
#ifdef FULL_V1_DIRECTORIES
if (list_server_status(rl->routers, &router_status, 0)) {