diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 08:17:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 08:17:02 -0400 |
| commit | 9f217c83b0d91508af0d63f04216fa78cdbfbe1b (patch) | |
| tree | ec66be6c1139d45ebc2ad81d09156445ceca4b3c /src/or/networkstatus.h | |
| parent | 3f49474349538be499ab485c697c147c8829fa0d (diff) | |
| parent | f698b509d8efdc055cfc05c6feaf0aecee41b9d0 (diff) | |
| download | tor-9f217c83b0d91508af0d63f04216fa78cdbfbe1b.tar.gz tor-9f217c83b0d91508af0d63f04216fa78cdbfbe1b.zip | |
Merge branch 'bug18809_028_squashed' into maint-0.2.8
Diffstat (limited to 'src/or/networkstatus.h')
| -rw-r--r-- | src/or/networkstatus.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 9bbb9a389e..ac93e5de91 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -70,13 +70,12 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, networkstatus_t *networkstatus_get_live_consensus(time_t now); networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now, int flavor); -int networkstatus_consensus_is_boostrapping(time_t now); +MOCK_DECL(int, networkstatus_consensus_is_bootstrapping,(time_t now)); int networkstatus_consensus_can_use_multiple_directories( const or_options_t *options); -int networkstatus_consensus_can_use_extra_fallbacks( - const or_options_t *options); -int networkstatus_consensus_has_excess_connections(void); -int networkstatus_consensus_is_downloading_usable_flavor(void); +MOCK_DECL(int, networkstatus_consensus_can_use_extra_fallbacks,( + const or_options_t *options)); +int networkstatus_consensus_is_already_downloading(const char *resource); #define NSSET_FROM_CACHE 1 #define NSSET_WAS_WAITING_FOR_CERTS 2 |