diff options
author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-12-17 11:40:49 +1100 |
---|---|---|
committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2015-12-17 11:40:49 +1100 |
commit | 1b704979488fad24bc439b52e7392e6936955577 (patch) | |
tree | ad6a134eafdfa36752079502fa6750fb25a45afe /src/or/router.c | |
parent | e7e61ec7ec32b4aa874a38991358812438405d96 (diff) | |
download | tor-1b704979488fad24bc439b52e7392e6936955577.tar.gz tor-1b704979488fad24bc439b52e7392e6936955577.zip |
Prop210: Fix directory fetch tests
Check that directory fetches behave as expected under Prop 210.
Diffstat (limited to 'src/or/router.c')
-rw-r--r-- | src/or/router.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/router.c b/src/or/router.c index 49e2e318f5..c35f629f30 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1457,8 +1457,8 @@ static int server_is_advertised=0; /** Return true iff we have published our descriptor lately. */ -int -advertised_server_mode(void) +MOCK_IMPL(int, +advertised_server_mode,(void)) { return server_is_advertised; } @@ -1820,8 +1820,8 @@ static int router_guess_address_from_dir_headers(uint32_t *guess); * it's configured in torrc, or because we've learned it from * dirserver headers. Place the answer in *<b>addr</b> and return * 0 on success, else return -1 if we have no guess. */ -int -router_pick_published_address(const or_options_t *options, uint32_t *addr) +MOCK_IMPL(int, +router_pick_published_address,(const or_options_t *options, uint32_t *addr)) { *addr = get_last_resolved_addr(); if (!*addr && |