diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-01-15 22:39:15 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-01-15 22:39:15 -0500 |
| commit | 4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23 (patch) | |
| tree | 77b0407257fb8cd4cb94719df396969095d69e88 /src/or/networkstatus.h | |
| parent | 8e9b25e6c7a2e70c370881ab5748651b1c7de66f (diff) | |
| parent | 7699014e1e9e183d1fd840e59909bcf77ba3321b (diff) | |
| download | tor-4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23.tar.gz tor-4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/networkstatus.h')
| -rw-r--r-- | src/or/networkstatus.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index e01e6b5288..38fac557df 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -96,10 +96,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 get_net_param_from_list(smartlist_t *net_params, const char *name, - int default_val); int32_t networkstatus_get_param(networkstatus_t *ns, const char *param_name, - int32_t default_val); + int32_t default_val, int32_t min_val, + int32_t max_val); int getinfo_helper_networkstatus(control_connection_t *conn, const char *question, char **answer, const char **errmsg); |