nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move ConsensusParams to dirauth module.

Browse Source
This commit is contained in:
Nick Mathewson 2019-12-19 09:46:14 -05:00
parent 77dea66e19
commit 0c7fd83123
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/config/config.c
View File

@ -371,7 +371,6 @@ static const config_var_t option_vars_[] = {
V(ClientTransportPlugin, LINELIST, NULL), V(ClientTransportPlugin, LINELIST, NULL),
V(ClientUseIPv6, BOOL, "0"), V(ClientUseIPv6, BOOL, "0"),
V(ClientUseIPv4, BOOL, "1"), V(ClientUseIPv4, BOOL, "1"),
V(ConsensusParams, STRING, NULL),
V(ConnLimit, POSINT, "1000"), V(ConnLimit, POSINT, "1000"),
V(ConnDirectionStatistics, BOOL, "0"), V(ConnDirectionStatistics, BOOL, "0"),
V(ConstrainedSockets, BOOL, "0"), V(ConstrainedSockets, BOOL, "0"),

4
src/app/config/or_options_st.h
View File

@ -670,10 +670,6 @@ struct or_options_t {
/** Location of guardfraction file */ /** Location of guardfraction file */
char *GuardfractionFile; char *GuardfractionFile;
/** Authority only: key=value pairs that we add to our networkstatus
* consensus vote on the 'params' line. */
char *ConsensusParams;
/** Authority only: minimum number of measured bandwidths we must see /** Authority only: minimum number of measured bandwidths we must see
* before we only believe measured bandwidths to assign flags. */ * before we only believe measured bandwidths to assign flags. */
int MinMeasuredBWsForAuthToIgnoreAdvertised; int MinMeasuredBWsForAuthToIgnoreAdvertised;

4
src/feature/dirauth/dirauth_options.inc
View File

@ -44,6 +44,10 @@ CONF_VAR(AuthDirSharedRandomness, BOOL, 0, "1")
/* NOTE: remove this option someday. */ /* NOTE: remove this option someday. */
CONF_VAR(AuthDirTestEd25519LinkKeys, BOOL, 0, "1") CONF_VAR(AuthDirTestEd25519LinkKeys, BOOL, 0, "1")
/** Authority only: key=value pairs that we add to our networkstatus
* consensus vote on the 'params' line. */
CONF_VAR(ConsensusParams, STRING, 0, NULL)
/** As directory authority, accept hidden service directories after what /** As directory authority, accept hidden service directories after what
* time? */ * time? */
CONF_VAR(MinUptimeHidServDirectoryV2, INTERVAL, 0, "96 hours") CONF_VAR(MinUptimeHidServDirectoryV2, INTERVAL, 0, "96 hours")

4
src/feature/dirauth/dirvote.c
View File

@ -4664,10 +4664,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
smartlist_add_strdup(v3_out->known_flags, "BadExit"); smartlist_add_strdup(v3_out->known_flags, "BadExit");
smartlist_sort_strings(v3_out->known_flags); smartlist_sort_strings(v3_out->known_flags);
if (options->ConsensusParams) { if (d_options->ConsensusParams) {
v3_out->net_params = smartlist_new(); v3_out->net_params = smartlist_new();
smartlist_split_string(v3_out->net_params, smartlist_split_string(v3_out->net_params,
options->ConsensusParams, NULL, 0, 0); d_options->ConsensusParams, NULL, 0, 0);
smartlist_sort_strings(v3_out->net_params); smartlist_sort_strings(v3_out->net_params);
} }
v3_out->bw_file_headers = bw_file_headers; v3_out->bw_file_headers = bw_file_headers;