diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 12:00:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 12:00:50 -0400 |
| commit | 0f4f40b70fe6ea16a43940f86db767e1a16a4f6e (patch) | |
| tree | 59ba8fa1332fa127ade5882da3836809bd540fea /src/or/networkstatus.h | |
| parent | 962b0b849bf0c2fcca387e334985b349a255de0a (diff) | |
| parent | 06500171434dca543e3daf74ce7033a0aef3d199 (diff) | |
| download | tor-0f4f40b70fe6ea16a43940f86db767e1a16a4f6e.tar.gz tor-0f4f40b70fe6ea16a43940f86db767e1a16a4f6e.zip | |
Merge remote-tracking branch 'dgoulet/ticket12541_032_02'
Diffstat (limited to 'src/or/networkstatus.h')
| -rw-r--r-- | src/or/networkstatus.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index adaa108904..89ff7eaba6 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -109,10 +109,9 @@ void signed_descs_update_status_from_consensus_networkstatus( char *networkstatus_getinfo_helper_single(const routerstatus_t *rs); char *networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now); void networkstatus_dump_bridge_status_to_file(time_t now); -int32_t networkstatus_get_param(const networkstatus_t *ns, - const char *param_name, - int32_t default_val, int32_t min_val, - int32_t max_val); +MOCK_DECL(int32_t, networkstatus_get_param, + (const networkstatus_t *ns, const char *param_name, + int32_t default_val, int32_t min_val, int32_t max_val)); int32_t networkstatus_get_overridable_param(const networkstatus_t *ns, int32_t torrc_value, const char *param_name, |