diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-01-15 21:54:49 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-01-15 21:54:49 -0500 |
| commit | 7699014e1e9e183d1fd840e59909bcf77ba3321b (patch) | |
| tree | 2cfae869dd2470c7b51a15f15b4d1a240658d9f9 /src/or/networkstatus.h | |
| parent | bebd95e2c99ab3d17ebf6d1b005f483af079330a (diff) | |
| parent | a1860cc3f1d6224f3be40319a075471cb491e1aa (diff) | |
| download | tor-7699014e1e9e183d1fd840e59909bcf77ba3321b.tar.gz tor-7699014e1e9e183d1fd840e59909bcf77ba3321b.zip | |
Merge commit 'sebastian/bug2317' into 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 2f18dc9525..ec2e8f884d 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -81,10 +81,9 @@ void signed_descs_update_status_from_consensus_networkstatus( char *networkstatus_getinfo_helper_single(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); |