summaryrefslogtreecommitdiff
path: root/src/feature/nodelist
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-21 15:24:22 +1000
committerteor <teor@torproject.org>2019-10-21 15:24:22 +1000
commit7a72e71f74546715f30004474f5a4a482be46d7c (patch)
tree37b7d202797e88fcbebb12c02fe5a0c90d73f0e8 /src/feature/nodelist
parent77c85360f66222365f2fbb98982b8bc0e4781acb (diff)
parent4fde7699ee5975db55c418bc7011eaabc64d94c9 (diff)
downloadtor-7a72e71f74546715f30004474f5a4a482be46d7c.tar.gz
tor-7a72e71f74546715f30004474f5a4a482be46d7c.zip
Merge remote-tracking branch 'tor-github/pr/1434'
Diffstat (limited to 'src/feature/nodelist')
-rw-r--r--src/feature/nodelist/networkstatus.c8
-rw-r--r--src/feature/nodelist/networkstatus.h3
2 files changed, 7 insertions, 4 deletions
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 496bafb865..b4b98301b0 100644
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -216,10 +216,10 @@ networkstatus_reset_download_failures(void)
}
/** Return the filename used to cache the consensus of a given flavor */
-static char *
-networkstatus_get_cache_fname(int flav,
- const char *flavorname,
- int unverified_consensus)
+MOCK_IMPL(char *,
+networkstatus_get_cache_fname,(int flav,
+ const char *flavorname,
+ int unverified_consensus))
{
char buf[128];
const char *prefix;
diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h
index 600fd7fbd5..e2c6ba611a 100644
--- a/src/feature/nodelist/networkstatus.h
+++ b/src/feature/nodelist/networkstatus.h
@@ -16,6 +16,9 @@
void networkstatus_reset_warnings(void);
void networkstatus_reset_download_failures(void);
+MOCK_DECL(char *,networkstatus_get_cache_fname,(int flav,
+ const char *flavorname,
+ int unverified_consensus));
tor_mmap_t *networkstatus_map_cached_consensus(const char *flavorname);
int router_reload_consensus_networkstatus(void);
void routerstatus_free_(routerstatus_t *rs);