diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-10-11 18:52:40 +0000 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-10-11 18:52:40 +0000 |
| commit | e1102fdaf6f638f5b588be370f72d98a13943565 (patch) | |
| tree | 1eff3292ce99b84d9bf67698edf4cf75e5ff6ea8 | |
| parent | 5e95ad55dc1ec42d4e0a2d9a22863f13c67b5f5a (diff) | |
| parent | b9b0abd6c26d9b361923925dbd04eb50a6a69426 (diff) | |
| download | tor-e1102fdaf6f638f5b588be370f72d98a13943565.tar.gz tor-e1102fdaf6f638f5b588be370f72d98a13943565.zip | |
Merge branch 'bug40869_049' into 'main'
Fix the spelling of maxunmeasur(e)dbw.
See merge request tpo/core/tor!772
| -rw-r--r-- | changes/bug40869 | 3 | ||||
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 2 | ||||
| -rw-r--r-- | src/test/test_dir.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug40869 b/changes/bug40869 new file mode 100644 index 0000000000..da9666333f --- /dev/null +++ b/changes/bug40869 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority): + - Look at the network parameter "maxunmeasuredbw" with the + correct spelling. Fixes bug 40869; bugfix on 0.4.6.1-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 2839c6db15..f8290cde6d 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -1781,7 +1781,7 @@ networkstatus_compute_consensus(smartlist_t *votes, { max_unmeasured_bw_kb = dirvote_get_intermediate_param_value( - param_list, "maxunmeasurdbw", DEFAULT_MAX_UNMEASURED_BW_KB); + param_list, "maxunmeasuredbw", DEFAULT_MAX_UNMEASURED_BW_KB); if (max_unmeasured_bw_kb < 1) max_unmeasured_bw_kb = 1; } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index baf67be4f8..87aaef7fe6 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4107,7 +4107,7 @@ vote_tweaks_for_umbw(networkstatus_t *v, int voter, time_t now) NULL, 0, -1); /* If we're using a non-default clip bandwidth, add it to net_params */ if (alternate_clip_bw > 0) { - tor_asprintf(&maxbw_param, "maxunmeasurdbw=%u", alternate_clip_bw); + tor_asprintf(&maxbw_param, "maxunmeasuredbw=%u", alternate_clip_bw); tt_assert(maxbw_param); if (maxbw_param) { smartlist_add(v->net_params, maxbw_param); |