mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug30316_035' into bug30316_040

Browse source 
Fixes conflicts and also moves bandwidth-file-digest.
This commit is contained in:
Nick Mathewson 2019-04-29 13:48:25 -04:00
commit 821dd54586
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug30316 Normal file
View file

@ -0,0 +1,4 @@
o Minor bugfixes (directory authority):
- Move the "bandwidth-file-headers" line in directory authority votes
so that it conforms to dir-spec.txt. Fixes bug 30316; bugfix on
0.3.5.1-alpha.

11
src/feature/dirauth/dirvote.c
View file

@ -348,11 +348,11 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
"known-flags %s\n" "known-flags %s\n"
"flag-thresholds %s\n" "flag-thresholds %s\n"
"params %s\n" "params %s\n"
"%s" /* bandwidth file headers */
"%s" /* bandwidth file digest */
"dir-source %s %s %s %s %d %d\n" "dir-source %s %s %s %s %d %d\n"
"contact %s\n" "contact %s\n"
"%s" /* shared randomness information */ "%s" /* shared randomness information */
"%s" /* bandwidth file headers */
"%s" /* bandwidth file */
, ,
v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion",
methods, methods,
@ -365,14 +365,13 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
flags, flags,
flag_thresholds, flag_thresholds,
params, params,
bw_headers_line ? bw_headers_line : "",
bw_file_digest ? bw_file_digest: "",
voter->nickname, fingerprint, voter->address, voter->nickname, fingerprint, voter->address,
fmt_addr32(addr), voter->dir_port, voter->or_port, fmt_addr32(addr), voter->dir_port, voter->or_port,
voter->contact, voter->contact,
shared_random_vote_str ? shared_random_vote_str ?
shared_random_vote_str : "", shared_random_vote_str : "");
bw_headers_line ?
bw_headers_line : "",
bw_file_digest ? bw_file_digest: "");
tor_free(params); tor_free(params);
tor_free(flags); tor_free(flags);