nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-30 08:33:59 -04:00
commit ac9d08f66a
9 changed files with 395 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket3723 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (directory authority):
- When a bandwidth file is used to obtain the bandwidth measurements,
include this bandwidth file headers in the votes. Closes ticket 3723.

2
src/app/config/config.c
View File

@ -3570,7 +3570,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
"(Bridge/V3)AuthoritativeDir is set.");
/* If we have a v3bandwidthsfile and it's broken, complain on startup */
if (options->V3BandwidthsFile && !old_options) {
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL);
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL);
}
/* same for guardfraction file */
if (options->GuardfractionFile && !old_options) {

44
src/feature/dirauth/dirvote.c
View File

@ -255,6 +255,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
/* XXXX Abstraction violation: should be pulling a field out of v3_ns.*/
char *flag_thresholds = dirserv_get_flag_thresholds_line();
char *params;
char *bw_headers_line = NULL;
authority_cert_t *cert = v3_ns->cert;
char *methods =
make_consensus_method_list(MIN_SUPPORTED_CONSENSUS_METHOD,
@ -268,8 +269,32 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
params = smartlist_join_strings(v3_ns->net_params, " ", 0, NULL);
else
params = tor_strdup("");
tor_assert(cert);
/* v3_ns->bw_file_headers is only set when V3BandwidthsFile is
* configured */
if (v3_ns->bw_file_headers) {
char *bw_file_headers = NULL;
/* If there are too many headers, leave the header string NULL */
if (! BUG(smartlist_len(v3_ns->bw_file_headers)
> MAX_BW_FILE_HEADER_COUNT_IN_VOTE)) {
bw_file_headers = smartlist_join_strings(v3_ns->bw_file_headers, " ",
0, NULL);
if (BUG(strlen(bw_file_headers) > MAX_BW_FILE_HEADERS_LINE_LEN)) {
/* Free and set to NULL, because the line was too long */
tor_free(bw_file_headers);
}
}
if (!bw_file_headers) {
/* If parsing failed, add a bandwidth header line with no entries */
bw_file_headers = tor_strdup("");
}
/* At this point, the line will always be present */
bw_headers_line = format_line_if_present("bandwidth-file-headers",
bw_file_headers);
tor_free(bw_file_headers);
}
smartlist_add_asprintf(chunks,
"network-status-version 3\n"
"vote-status %s\n"
@ -287,7 +312,9 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
"params %s\n"
"dir-source %s %s %s %s %d %d\n"
"contact %s\n"
"%s", /* shared randomness information */
"%s" /* shared randomness information */
"%s" /* bandwidth file headers */
,
v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion",
methods,
published, va, fu, vu,
@ -303,13 +330,16 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
fmt_addr32(addr), voter->dir_port, voter->or_port,
voter->contact,
shared_random_vote_str ?
shared_random_vote_str : "");
shared_random_vote_str : "",
bw_headers_line ?
bw_headers_line : "");
tor_free(params);
tor_free(flags);
tor_free(flag_thresholds);
tor_free(methods);
tor_free(shared_random_vote_str);
tor_free(bw_headers_line);
if (!tor_digest_is_zero(voter->legacy_id_digest)) {
char fpbuf[HEX_DIGEST_LEN+1];
@ -4343,6 +4373,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
digestmap_t *omit_as_sybil = NULL;
const int vote_on_reachability = running_long_enough_to_decide_unreachable();
smartlist_t *microdescriptors = NULL;
smartlist_t *bw_file_headers = NULL;
tor_assert(private_key);
tor_assert(cert);
@ -4380,7 +4411,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
* set_routerstatus_from_routerinfo() see up-to-date bandwidth info.
*/
if (options->V3BandwidthsFile) {
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL);
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL);
} else {
/*
* No bandwidths file; clear the measured bandwidth cache in case we had
@ -4482,8 +4513,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
/* This pass through applies the measured bw lines to the routerstatuses */
if (options->V3BandwidthsFile) {
/* Only set bw_file_headers when V3BandwidthsFile is configured */
bw_file_headers = smartlist_new();
dirserv_read_measured_bandwidths(options->V3BandwidthsFile,
routerstatuses);
routerstatuses, bw_file_headers);
} else {
/*
* No bandwidths file; clear the measured bandwidth cache in case we had
@ -4579,6 +4612,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
options->ConsensusParams, NULL, 0, 0);
smartlist_sort_strings(v3_out->net_params);
}
v3_out->bw_file_headers = bw_file_headers;
voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
voter->nickname = tor_strdup(options->Nickname);

3
src/feature/dirauth/dirvote.h
View File

@ -89,6 +89,9 @@
#define DGV_INCLUDE_PENDING 2
#define DGV_INCLUDE_PREVIOUS 4
/** Maximum size of a line in a vote. */
#define MAX_BW_FILE_HEADERS_LINE_LEN 1024
/*
* Public API. Used outside of the dirauth subsystem.
*

34
src/feature/dircache/dirserv.c
View File

@ -51,6 +51,7 @@
#include "lib/crypt_ops/crypto_format.h"
#include "lib/encoding/confline.h"
#include "lib/encoding/keyval.h"
/**
* \file dirserv.c
* \brief Directory server core implementation. Manages directory
@ -2599,12 +2600,14 @@ measured_bw_line_apply(measured_bw_line_t *parsed_line,
}
/**
* Read the measured bandwidth file and apply it to the list of
* vote_routerstatus_t. Returns -1 on error, 0 otherwise.
* Read the measured bandwidth list file, apply it to the list of
* vote_routerstatus_t and store all the headers in <b>bw_file_headers</b>.
* Returns -1 on error, 0 otherwise.
*/
int
dirserv_read_measured_bandwidths(const char *from_file,
smartlist_t *routerstatuses)
smartlist_t *routerstatuses,
smartlist_t *bw_file_headers)
{
FILE *fp = tor_fopen_cloexec(from_file, "r");
int applied_lines = 0;
@ -2654,6 +2657,12 @@ dirserv_read_measured_bandwidths(const char *from_file,
goto err;
}
/* If timestamp was correct and bw_file_headers is not NULL,
* add timestamp to bw_file_headers */
if (bw_file_headers)
smartlist_add_asprintf(bw_file_headers, "timestamp=%lu",
(unsigned long)file_time);
if (routerstatuses)
smartlist_sort(routerstatuses, compare_vote_routerstatus_entries);
@ -2669,7 +2678,24 @@ dirserv_read_measured_bandwidths(const char *from_file,
dirserv_cache_measured_bw(&parsed_line, file_time);
if (measured_bw_line_apply(&parsed_line, routerstatuses) > 0)
applied_lines++;
}
/* if the terminator is found, it is the end of header lines, set the
* flag but do not store anything */
} else if (strcmp(line, BW_FILE_HEADERS_TERMINATOR) == 0) {
line_is_after_headers = 1;
/* if the line was not a correct relay line nor the terminator and
* the end of the header lines has not been detected yet
* and it is key_value and bw_file_headers did not reach the maximum
* number of headers,
* then assume this line is a header and add it to bw_file_headers */
} else if (bw_file_headers &&
(line_is_after_headers == 0) &&
string_is_key_value(LOG_DEBUG, line) &&
!strchr(line, ' ') &&
(smartlist_len(bw_file_headers)
< MAX_BW_FILE_HEADER_COUNT_IN_VOTE)) {
line[strlen(line)-1] = '\0';
smartlist_add_strdup(bw_file_headers, line);
};
}
}

10
src/feature/dircache/dirserv.h
View File

@ -49,6 +49,13 @@ typedef enum {
/** Maximum allowable length of a version line in a networkstatus. */
#define MAX_V_LINE_LEN 128
/** Maximum allowable length of bandwidth headers in a bandwidth file */
#define MAX_BW_FILE_HEADER_COUNT_IN_VOTE 50
/** Terminatore that separates bandwidth file headers from bandwidth file
* relay lines */
#define BW_FILE_HEADERS_TERMINATOR "=====\n"
/** Ways to convert a spoolable_resource_t to a bunch of bytes. */
typedef enum dir_spool_source_t {
DIR_SPOOL_SERVER_BY_DIGEST=1, DIR_SPOOL_SERVER_BY_FP,
@ -217,7 +224,8 @@ dirserv_read_guardfraction_file_from_str(const char *guardfraction_file_str,
#endif /* defined(DIRSERV_PRIVATE) */
int dirserv_read_measured_bandwidths(const char *from_file,
smartlist_t *routerstatuses);
smartlist_t *routerstatuses,
smartlist_t *bw_file_headers);
int dirserv_read_guardfraction_file(const char *fname,
smartlist_t *vote_routerstatuses);

5
src/feature/nodelist/networkstatus.c
View File

@ -385,6 +385,11 @@ networkstatus_vote_free_(networkstatus_t *ns)
smartlist_free(ns->routerstatus_list);
}
if (ns->bw_file_headers) {
SMARTLIST_FOREACH(ns->bw_file_headers, char *, c, tor_free(c));
smartlist_free(ns->bw_file_headers);
}
digestmap_free(ns->desc_digest_map, NULL);
if (ns->sr_info.commits) {

3
src/feature/nodelist/networkstatus_st.h
View File

@ -96,6 +96,9 @@ struct networkstatus_t {
/** Contains the shared random protocol data from a vote or consensus. */
networkstatus_sr_info_t sr_info;
/** List of key=value strings from the headers of the bandwidth list file */
smartlist_t *bw_file_headers;
};
#endif

379
src/test/test_dir.c
View File

@ -1592,25 +1592,6 @@ test_dir_measured_bw_kb(void *arg)
return;
}
/* Test dirserv_read_measured_bandwidths */
static void
test_dir_dirserv_read_measured_bandwidths_empty(void *arg)
{
char *fname=NULL;
(void)arg;
fname = tor_strdup(get_fname("V3BandwidthsFile"));
/* Test an empty file */
write_str_to_file(fname, "", 0);
setup_capture_of_logs(LOG_WARN);
tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
expect_log_msg("Empty bandwidth file\n");
done:
tor_free(fname);
teardown_capture_of_logs();
}
/* Unit tests for measured_bw_line_parse using line_is_after_headers flag.
* When the end of the header is detected (a first complete bw line is parsed),
* incomplete lines fail and give warnings, but do not give warnings if
@ -1654,7 +1635,7 @@ test_dir_measured_bw_kb_line_is_after_headers(void *arg)
teardown_capture_of_logs();
}
/* Test dirserv_read_measured_bandwidths with whole files. */
/* Test dirserv_read_measured_bandwidths with headers and complete files. */
static void
test_dir_dirserv_read_measured_bandwidths(void *arg)
{
@ -1662,76 +1643,321 @@ test_dir_dirserv_read_measured_bandwidths(void *arg)
char *content = NULL;
time_t timestamp = time(NULL);
char *fname = tor_strdup(get_fname("V3BandwidthsFile"));
/* Test Torflow file only with timestamp*/
tor_asprintf(&content, "%ld", (long)timestamp);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
/* Test Torflow file with timestamp followed by '\n' */
tor_asprintf(&content, "%ld\n", (long)timestamp);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
/* Test Torflow complete file*/
const char *torflow_relay_lines=
smartlist_t *bw_file_headers = smartlist_new();
/* bw file strings in vote */
char *bw_file_headers_str = NULL;
char *bw_file_headers_str_v100 = NULL;
char *bw_file_headers_str_v110 = NULL;
char *bw_file_headers_str_bad = NULL;
char *bw_file_headers_str_extra = NULL;
char bw_file_headers_str_long[MAX_BW_FILE_HEADER_COUNT_IN_VOTE * 8 + 1] = "";
/* string header lines in bw file */
char *header_lines_v100 = NULL;
char *header_lines_v110_no_terminator = NULL;
char *header_lines_v110 = NULL;
char header_lines_long[MAX_BW_FILE_HEADER_COUNT_IN_VOTE * 8 + 1] = "";
int i;
const char *header_lines_v110_no_terminator_no_timestamp =
"version=1.1.0\n"
"software=sbws\n"
"software_version=0.1.0\n"
"earliest_bandwidth=2018-05-08T16:13:26\n"
"file_created=2018-04-16T21:49:18\n"
"generator_started=2018-05-08T16:13:25\n"
"latest_bandwidth=2018-04-16T20:49:18\n";
const char *bw_file_headers_str_v110_no_timestamp =
"version=1.1.0 software=sbws "
"software_version=0.1.0 "
"earliest_bandwidth=2018-05-08T16:13:26 "
"file_created=2018-04-16T21:49:18 "
"generator_started=2018-05-08T16:13:25 "
"latest_bandwidth=2018-04-16T20:49:18";
const char *relay_lines_v100 =
"node_id=$557365204145532d32353620696e73746561642e bw=1024 "
"nick=Test measured_at=1523911725 updated_at=1523911725 "
"pid_error=4.11374090719 pid_error_sum=4.11374090719 "
"pid_bw=57136645 pid_delta=2.12168374577 circ_fail=0.2 "
"scanner=/filepath\n";
tor_asprintf(&content, "%ld\n%s", (long)timestamp, torflow_relay_lines);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
/* Test Torflow complete file including v1.1.0 headers */
const char *v110_header_lines=
"version=1.1.0\n"
"software=sbws\n"
"software_version=0.1.0\n"
"generator_started=2018-05-08T16:13:25\n"
"earliest_bandwidth=2018-05-08T16:13:26\n"
"====\n";
tor_asprintf(&content, "%ld\n%s%s", (long)timestamp, v110_header_lines,
torflow_relay_lines);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
/* Test Torflow with additional headers afer a correct bw line */
tor_asprintf(&content, "%ld\n%s%s", (long)timestamp, torflow_relay_lines,
v110_header_lines);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
/* Test Torflow with additional headers afer a correct bw line and more
* bw lines after the headers. */
tor_asprintf(&content, "%ld\n%s%s%s", (long)timestamp, torflow_relay_lines,
v110_header_lines, torflow_relay_lines);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
/* Test sbws file */
const char *sbws_relay_lines=
const char *relay_lines_v110 =
"node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 "
"master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ "
"bw=760 nick=Test rtt=380 time=2018-05-08T16:13:26\n";
const char *relay_lines_bad =
"node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A\n";
tor_asprintf(&content, "%ld\n%s%s", (long)timestamp, v110_header_lines,
sbws_relay_lines);
tor_asprintf(&header_lines_v100, "%ld\n", (long)timestamp);
tor_asprintf(&header_lines_v110_no_terminator, "%ld\n%s", (long)timestamp,
header_lines_v110_no_terminator_no_timestamp);
tor_asprintf(&header_lines_v110, "%s%s",
header_lines_v110_no_terminator, BW_FILE_HEADERS_TERMINATOR);
tor_asprintf(&bw_file_headers_str_v100, "timestamp=%ld",(long)timestamp);
tor_asprintf(&bw_file_headers_str_v110, "timestamp=%ld %s",
(long)timestamp, bw_file_headers_str_v110_no_timestamp);
tor_asprintf(&bw_file_headers_str_bad, "%s "
"node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A",
bw_file_headers_str_v110);
for (i=0; i<MAX_BW_FILE_HEADER_COUNT_IN_VOTE; i++) {
strlcat(header_lines_long, "foo=bar\n",
sizeof(header_lines_long));
}
/* 8 is the number of v110 lines in header_lines_v110 */
for (i=0; i<MAX_BW_FILE_HEADER_COUNT_IN_VOTE - 8 - 1; i++) {
strlcat(bw_file_headers_str_long, "foo=bar ",
sizeof(bw_file_headers_str_long));
}
strlcat(bw_file_headers_str_long, "foo=bar",
sizeof(bw_file_headers_str_long));
tor_asprintf(&bw_file_headers_str_extra,
"%s %s",
bw_file_headers_str_v110,
bw_file_headers_str_long);
/* Test an empty bandwidth file. bw_file_headers will be empty string */
write_str_to_file(fname, "", 0);
setup_capture_of_logs(LOG_WARN);
tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
expect_log_msg("Empty bandwidth file\n");
teardown_capture_of_logs();
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op("", OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test bandwidth file with only timestamp.
* bw_file_headers will be empty string */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%ld", (long)timestamp);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op("", OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.0.0 bandwidth file headers */
write_str_to_file(fname, header_lines_v100, 0);
bw_file_headers = smartlist_new();
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.0.0 complete bandwidth file */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s", header_lines_v100, relay_lines_v100);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.0.0 complete bandwidth file with NULL bw_file_headers. */
tor_asprintf(&content, "%s%s", header_lines_v100, relay_lines_v100);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL));
/* Test bandwidth file including v1.1.0 bandwidth headers and
* v1.0.0 relay lines. bw_file_headers will contain the v1.1.0 headers. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s", header_lines_v100, header_lines_v110,
relay_lines_v100);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.0.0 complete bandwidth file with v1.1.0 headers at the end.
* bw_file_headers will contain only v1.0.0 headers and the additional
* headers will be interpreted as malformed relay lines. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s", header_lines_v100, relay_lines_v100,
header_lines_v110);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.0.0 complete bandwidth file, the v1.1.0 headers and more relay
* lines. bw_file_headers will contain only v1.0.0 headers, the additional
* headers will be interpreted as malformed relay lines and the last relay
* lines will be correctly interpreted as relay lines. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s%s", header_lines_v100, relay_lines_v100,
header_lines_v110, relay_lines_v100);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v100, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers without terminator */
bw_file_headers = smartlist_new();
write_str_to_file(fname, header_lines_v110_no_terminator, 0);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers with terminator */
bw_file_headers = smartlist_new();
write_str_to_file(fname, header_lines_v110, 0);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth file without terminator, then relay lines.
* bw_file_headers will contain the v1.1.0 headers. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s",
header_lines_v110_no_terminator, relay_lines_v110);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers with terminator, then relay lines
* bw_file_headers will contain the v1.1.0 headers. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s",
header_lines_v110, relay_lines_v110);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers with terminator, then bad relay lines,
* then terminator, then relay_lines_bad.
* bw_file_headers will contain the v1.1.0 headers. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s%s", header_lines_v110, relay_lines_bad,
BW_FILE_HEADERS_TERMINATOR, relay_lines_bad);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_v110, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers without terminator, then bad relay lines,
* then relay lines. bw_file_headers will contain the v1.1.0 headers and
* the bad relay lines. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s",
header_lines_v110_no_terminator, relay_lines_bad,
relay_lines_v110);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_bad, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers without terminator,
* then many bad relay lines, then relay lines.
* bw_file_headers will contain the v1.1.0 headers and the bad relay lines
* to a maximum of MAX_BW_FILE_HEADER_COUNT_IN_VOTE header lines. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s",
header_lines_v110_no_terminator, header_lines_long,
relay_lines_v110);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
tt_int_op(MAX_BW_FILE_HEADER_COUNT_IN_VOTE, OP_EQ,
smartlist_len(bw_file_headers));
bw_file_headers_str = smartlist_join_strings(bw_file_headers, " ", 0, NULL);
tt_str_op(bw_file_headers_str_extra, OP_EQ, bw_file_headers_str);
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
/* Test v1.1.0 bandwidth headers without terminator,
* then many bad relay lines, then relay lines.
* bw_file_headers will contain the v1.1.0 headers and the bad relay lines.
* Force bw_file_headers to have more than MAX_BW_FILE_HEADER_COUNT_IN_VOTE
* This test is needed while there is not dirvote test. */
bw_file_headers = smartlist_new();
tor_asprintf(&content, "%s%s%s",
header_lines_v110_no_terminator, header_lines_long,
relay_lines_v110);
write_str_to_file(fname, content, 0);
tor_free(content);
tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL,
bw_file_headers));
tt_int_op(MAX_BW_FILE_HEADER_COUNT_IN_VOTE, OP_EQ,
smartlist_len(bw_file_headers));
/* force bw_file_headers to be bigger than
* MAX_BW_FILE_HEADER_COUNT_IN_VOTE */
char line[8] = "foo=bar\0";
smartlist_add_strdup(bw_file_headers, line);
tt_int_op(MAX_BW_FILE_HEADER_COUNT_IN_VOTE, OP_LT,
smartlist_len(bw_file_headers));
SMARTLIST_FOREACH(bw_file_headers, char *, c, tor_free(c));
smartlist_free(bw_file_headers);
tor_free(bw_file_headers_str);
done:
tor_free(fname);
tor_free(header_lines_v100);
tor_free(header_lines_v110_no_terminator);
tor_free(header_lines_v110);
tor_free(bw_file_headers_str_v100);
tor_free(bw_file_headers_str_v110);
tor_free(bw_file_headers_str_bad);
tor_free(bw_file_headers_str_extra);
}
#define MBWC_INIT_TIME 1000
@ -6053,7 +6279,6 @@ struct testcase_t dir_tests[] = {
DIR_LEGACY(versions),
DIR_LEGACY(fp_pairs),
DIR(split_fps, 0),
DIR_LEGACY(dirserv_read_measured_bandwidths_empty),
DIR_LEGACY(measured_bw_kb),
DIR_LEGACY(measured_bw_kb_line_is_after_headers),
DIR_LEGACY(measured_bw_kb_cache),