diff options
author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-12-11 22:14:46 +1100 |
---|---|---|
committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-12-14 23:46:47 +1100 |
commit | 1c2366ea43d44b2d6d04303fd6086405d7ca4b6c (patch) | |
tree | 3dad8974d39e7e9359a4a00e08c99ba3525a1e5c /src/or/config.h | |
parent | 85003f4c80b7c980099fedca7dba0c0a90209084 (diff) | |
download | tor-1c2366ea43d44b2d6d04303fd6086405d7ca4b6c.tar.gz tor-1c2366ea43d44b2d6d04303fd6086405d7ca4b6c.zip |
Authorities on IPv6: minor fixes and unit tests
Update the code for IPv6 authorities and fallbacks for function
argument changes.
Update unit tests affected by the function argument changes in
the patch.
Add unit tests for authority and fallback:
* adding via a function
* line parsing
* adding default authorities
(Adding default fallbacks is unit tested in #15775.)
Diffstat (limited to 'src/or/config.h')
-rw-r--r-- | src/or/config.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/config.h b/src/or/config.h index 7e8868804e..bfdd1694eb 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -152,10 +152,12 @@ STATIC int parse_transport_line(const or_options_t *options, int server); STATIC int consider_adding_dir_servers(const or_options_t *options, const or_options_t *old_options); +STATIC void add_default_trusted_dir_authorities(dirinfo_type_t type); MOCK_DECL(STATIC void, add_default_fallback_dir_servers, (void)); -STATIC int -parse_dir_fallback_line(const char *line, - int validate_only); +STATIC int parse_dir_authority_line(const char *line, + dirinfo_type_t required_type, + int validate_only); +STATIC int parse_dir_fallback_line(const char *line, int validate_only); #endif #endif |