commit be9bc5981f21a73508e32207fd197b513a6f01be Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 19 09:51:11 2019 -0500
Move MinMeasuredBWsForAuthToIgnoreAdvertised to dirauth module. --- src/app/config/config.c | 1 - src/app/config/or_options_st.h | 4 ---- src/feature/dirauth/bwauth.c | 4 +++- src/feature/dirauth/dirauth_options.inc | 4 ++++ src/feature/dirauth/voteflags.c | 5 +++-- 5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c index 65a0733e0..262013de4 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -555,7 +555,6 @@ static const config_var_t option_vars_[] = { OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MaxUnparseableDescSizeToLog, MEMUNIT, "10 MB"), - V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), VAR("MyFamily", LINELIST, MyFamily_lines, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), OBSOLETE("NamingAuthoritativeDirectory"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index eaa32f9bf..2796aaba7 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -670,10 +670,6 @@ struct or_options_t { /** Location of guardfraction file */ char *GuardfractionFile;
- /** Authority only: minimum number of measured bandwidths we must see - * before we only believe measured bandwidths to assign flags. */ - int MinMeasuredBWsForAuthToIgnoreAdvertised; - /** The length of time that we think an initial consensus should be fresh. * Only altered on testing networks. */ int TestingV3AuthInitialVotingInterval; diff --git a/src/feature/dirauth/bwauth.c b/src/feature/dirauth/bwauth.c index b1cde7962..866ea9683 100644 --- a/src/feature/dirauth/bwauth.c +++ b/src/feature/dirauth/bwauth.c @@ -13,10 +13,12 @@ #include "feature/dirauth/bwauth.h"
#include "app/config/config.h" +#include "feature/dirauth/dirauth_sys.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/routerlist.h" #include "feature/dirparse/ns_parse.h"
+#include "feature/dirauth/dirauth_options_st.h" #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/vote_routerstatus_st.h"
@@ -182,7 +184,7 @@ dirserv_get_credible_bandwidth_kb(const routerinfo_t *ri) /* Check if we have a measured bandwidth, and check the threshold if not */ if (!(dirserv_query_measured_bw_cache_kb(ri->cache_info.identity_digest, &mbw_kb, NULL))) { - threshold = get_options()->MinMeasuredBWsForAuthToIgnoreAdvertised; + threshold = dirauth_get_options()->MinMeasuredBWsForAuthToIgnoreAdvertised; if (routers_with_measured_bw > threshold) { /* Return zero for unmeasured bandwidth if we are above threshold */ bw_kb = 0; diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc index f3d8e35b3..d5ae09cf2 100644 --- a/src/feature/dirauth/dirauth_options.inc +++ b/src/feature/dirauth/dirauth_options.inc @@ -48,6 +48,10 @@ CONF_VAR(AuthDirTestEd25519LinkKeys, BOOL, 0, "1") * consensus vote on the 'params' line. */ CONF_VAR(ConsensusParams, STRING, 0, NULL)
+/** Authority only: minimum number of measured bandwidths we must see + * before we only believe measured bandwidths to assign flags. */ +CONF_VAR(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, 0, "500") + /** As directory authority, accept hidden service directories after what * time? */ CONF_VAR(MinUptimeHidServDirectoryV2, INTERVAL, 0, "96 hours") diff --git a/src/feature/dirauth/voteflags.c b/src/feature/dirauth/voteflags.c index d0bc30d4c..97cb2eb72 100644 --- a/src/feature/dirauth/voteflags.c +++ b/src/feature/dirauth/voteflags.c @@ -244,11 +244,12 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil) const smartlist_t *nodelist; time_t now = time(NULL); const or_options_t *options = get_options(); + const dirauth_options_t *dirauth_options = dirauth_get_options();
/* Require mbw? */ int require_mbw = (dirserv_get_last_n_measured_bws() > - options->MinMeasuredBWsForAuthToIgnoreAdvertised) ? 1 : 0; + dirauth_options->MinMeasuredBWsForAuthToIgnoreAdvertised) ? 1 : 0;
/* initialize these all here, in case there are no routers */ stable_uptime = 0; @@ -432,7 +433,7 @@ dirserv_get_flag_thresholds_line(void) { char *result=NULL; const int measured_threshold = - get_options()->MinMeasuredBWsForAuthToIgnoreAdvertised; + dirauth_get_options()->MinMeasuredBWsForAuthToIgnoreAdvertised; const int enough_measured_bw = dirserv_get_last_n_measured_bws() > measured_threshold;