diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-03-29 19:50:59 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-03-29 19:50:59 +0000 |
| commit | 6a79b1cb57ac524c1085e23f32f410d79d5471d7 (patch) | |
| tree | 218bd858b58fdfba0226b7af39b86a8bdf72432e /src/or/routerlist.c | |
| parent | 0e6084d751a66d45d5e6ac6d5d6de4771a24680f (diff) | |
| download | tor-6a79b1cb57ac524c1085e23f32f410d79d5471d7.tar tor-6a79b1cb57ac524c1085e23f32f410d79d5471d7.tar.gz | |
Re-enable unit tests for directory generation.
svn:r1362
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 923f8b3c5..daabe5122 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -111,7 +111,7 @@ static int router_get_list_from_string_impl(const char **s, routerlist_t **dest, int n_good_nicknames, const char **good_nickname_lst); -static int +int /* Exposed for unit tests */ router_get_routerlist_from_directory_impl(const char *s, routerlist_t **dest, crypto_pk_env_t *pkey); static int @@ -119,8 +119,6 @@ router_add_exit_policy(routerinfo_t *router, directory_token_t *tok); static int router_resolve_routerlist(routerlist_t *dir); - - static int router_get_hash_impl(const char *s, char *digest, const char *start_str, const char *end_str); static void token_free(directory_token_t *tok); @@ -575,7 +573,7 @@ static int parse_time(const char *cp, time_t *t) * resulting routerlist in *dest, freeing the old value if necessary. * If pkey is provided, we check the directory signature with pkey. */ -static int +int /* Should be static; exposed for unit tests */ router_get_routerlist_from_directory_impl(const char *str, routerlist_t **dest, crypto_pk_env_t *pkey) |