torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

dir auths now omit Measured= if rs->is_authority

Browse Source 
Directory authorities stop voting a consensus "Measured" weight
for relays with the Authority flag. Now these relays will be
considered unmeasured, which should reserve their bandwidth
for their dir auth role and minimize distractions from other roles.

In place of the "Measured" weight, they now include a
"MeasuredButAuthority" weight (not used by anything) so the bandwidth
authority's opinion on this relay can be recorded for posterity.

Resolves ticket 40698.
This commit is contained in:
Roger Dingledine
2022-10-20 20:56:33 -04:00
parent ea2ba4f5a8
commit bab8375ef5
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug40698
+11
View File
@@ -0,0 +1,11 @@
o Minor bugfixes (dirauth):
- Directory authorities stop voting a consensus "Measured" weight
for relays with the Authority flag. Now these relays will be
considered unmeasured, which should reserve their bandwidth
for their dir auth role and minimize distractions from other
roles. In place of the "Measured" weight, they now include a
"MeasuredButAuthority" weight (not used by anything) so the
bandwidth authority's opinion on this relay can be recorded for
posterity. Lastly, remove the AuthDirDontVoteOnDirAuthBandwidth
torrc option which never worked right. Fixes bugs 40698 and 40700;
bugfix on 0.4.7.2-alpha.
src/feature/nodelist/fmt_routerstatus.c
+13 -2
View File
@@ -169,9 +169,20 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version,
smartlist_add_asprintf(chunks,
"w Bandwidth=%d", bw_kb);
/* Include the bandwidth weight from our external bandwidth
* authority, if we have one. */
if (format == NS_V3_VOTE && vrs && vrs->has_measured_bw) {
smartlist_add_asprintf(chunks,
" Measured=%d", vrs->measured_bw_kb);
if (!rs->is_authority) { /* normal case */
smartlist_add_asprintf(chunks,
" Measured=%d", vrs->measured_bw_kb);
} else {
/* dir auth special case: don't give it a Measured line, so we
* can reserve its attention for authority-specific activities.
* But do include the bwauth's opinion so it can be recorded for
* posterity. See #40698 for details. */
smartlist_add_asprintf(chunks,
" MeasuredButAuthority=%d", vrs->measured_bw_kb);
}
}
/* Write down guardfraction information if we have it. */
if (format == NS_V3_VOTE && vrs && vrs->status.has_guardfraction) {