mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-26 07:31:33 +01:00
Code Issues Projects Releases Wiki Activity

Rename bwlist to bw_file and banwidth to

Browse source 
bandwidth-file
This commit is contained in:
juga0 2018-06-29 20:43:51 +00:00
parent 6d8bc12583
commit d79c65772b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -254,7 +254,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
/* XXXX Abstraction violation: should be pulling a field out of v3_ns.*/ /* XXXX Abstraction violation: should be pulling a field out of v3_ns.*/
char *flag_thresholds = dirserv_get_flag_thresholds_line(); char *flag_thresholds = dirserv_get_flag_thresholds_line();
char *params; char *params;
char *bwlist_headers; char *bw_file_headers;
authority_cert_t *cert = v3_ns->cert; authority_cert_t *cert = v3_ns->cert;
char *methods = char *methods =
make_consensus_method_list(MIN_SUPPORTED_CONSENSUS_METHOD, make_consensus_method_list(MIN_SUPPORTED_CONSENSUS_METHOD,
@ -269,11 +269,11 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
else else
params = tor_strdup(""); params = tor_strdup("");
tor_assert(cert); tor_assert(cert);
if (v3_ns->bwlist_headers) if (v3_ns->bw_file_headers)
bwlist_headers = smartlist_join_strings(v3_ns->bwlist_headers, " ", 0, bw_file_headers = smartlist_join_strings(v3_ns->bw_file_headers, " ", 0,
NULL); NULL);
else else
bwlist_headers = tor_strdup(""); bw_file_headers = tor_strdup("");
smartlist_add_asprintf(chunks, smartlist_add_asprintf(chunks,
"network-status-version 3\n" "network-status-version 3\n"
"vote-status %s\n" "vote-status %s\n"
@ -292,7 +292,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
"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 */
"bandwidth-file %s\n", /* bandwidth file headers */ "bandwidth-file-headers %s\n", /* bandwidth file headers */
v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion",
methods, methods,
published, va, fu, vu, published, va, fu, vu,
@ -309,14 +309,14 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
voter->contact, voter->contact,
shared_random_vote_str ? shared_random_vote_str ?
shared_random_vote_str : "", shared_random_vote_str : "",
bwlist_headers); bw_file_headers);
tor_free(params); tor_free(params);
tor_free(flags); tor_free(flags);
tor_free(flag_thresholds); tor_free(flag_thresholds);
tor_free(methods); tor_free(methods);
tor_free(shared_random_vote_str); tor_free(shared_random_vote_str);
tor_free(bwlist_headers); tor_free(bw_file_headers);
if (!tor_digest_is_zero(voter->legacy_id_digest)) { if (!tor_digest_is_zero(voter->legacy_id_digest)) {
char fpbuf[HEX_DIGEST_LEN+1]; char fpbuf[HEX_DIGEST_LEN+1];
@ -4299,7 +4299,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
uint32_t addr; uint32_t addr;
char *hostname = NULL, *client_versions = NULL, *server_versions = NULL; char *hostname = NULL, *client_versions = NULL, *server_versions = NULL;
const char *contact; const char *contact;
smartlist_t *routers, *routerstatuses, *bwlist_headers; smartlist_t *routers, *routerstatuses, *bw_file_headers;
char identity_digest[DIGEST_LEN]; char identity_digest[DIGEST_LEN];
char signing_key_digest[DIGEST_LEN]; char signing_key_digest[DIGEST_LEN];
int listbadexits = options->AuthDirListBadExits; int listbadexits = options->AuthDirListBadExits;
@ -4383,7 +4383,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
routerstatuses = smartlist_new(); routerstatuses = smartlist_new();
microdescriptors = smartlist_new(); microdescriptors = smartlist_new();
bwlist_headers = smartlist_new(); bw_file_headers = smartlist_new();
SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) { SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) {
/* If it has a protover list and contains a protocol name greater than /* If it has a protover list and contains a protocol name greater than
@ -4450,7 +4450,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
/* This pass through applies the measured bw lines to the routerstatuses */ /* This pass through applies the measured bw lines to the routerstatuses */
if (options->V3BandwidthsFile) { if (options->V3BandwidthsFile) {
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, dirserv_read_measured_bandwidths(options->V3BandwidthsFile,
routerstatuses, bwlist_headers); routerstatuses, bw_file_headers);
} else { } else {
/* /*
* No bandwidths file; clear the measured bandwidth cache in case we had * No bandwidths file; clear the measured bandwidth cache in case we had
@ -4546,7 +4546,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
options->ConsensusParams, NULL, 0, 0); options->ConsensusParams, NULL, 0, 0);
smartlist_sort_strings(v3_out->net_params); smartlist_sort_strings(v3_out->net_params);
} }
v3_out->bwlist_headers = bwlist_headers; v3_out->bw_file_headers = bw_file_headers;
voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t)); voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
voter->nickname = tor_strdup(options->Nickname); voter->nickname = tor_strdup(options->Nickname);