diff options
| author | teor <teor2345@gmail.com> | 2015-04-15 19:02:29 +1000 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2015-04-23 00:16:04 +1000 |
| commit | d68bbb0a2939927eef221d8f9543a016f2c88245 (patch) | |
| tree | eee627ea44c60698713868d85d54cc925a3b06df /src/or/config.h | |
| parent | 027f73f70ef49859d5c6b7dc2a231b3f78dafd10 (diff) | |
| download | tor-d68bbb0a2939927eef221d8f9543a016f2c88245.tar.gz tor-d68bbb0a2939927eef221d8f9543a016f2c88245.zip | |
Unit tests for consider_adding_dir_servers() as modified in #15642
Unit tests for the 10 valid combinations of set/NULL config options
DirAuthorities, AlternateBridgeAuthority, AlternateDirAuthority,
and FallbackDir.
Add assertion in consider_adding_dir_servers() for checks in
validate_dir_servers():
"You cannot set both DirAuthority and Alternate*Authority."
Diffstat (limited to 'src/or/config.h')
| -rw-r--r-- | src/or/config.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.h b/src/or/config.h index b0b23bcfbd..74b28f45ca 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -144,6 +144,12 @@ STATIC int options_validate(or_options_t *old_options, STATIC int parse_transport_line(const or_options_t *options, const char *line, int validate_only, int server); +STATIC int consider_adding_dir_servers(const or_options_t *options, + const or_options_t *old_options); +MOCK_DECL(STATIC void, add_default_fallback_dir_servers, (void)); +STATIC int +parse_dir_fallback_line(const char *line, + int validate_only); #endif #endif |