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

Replace bwlist by bw_file and terminator condition

Browse Source 
If bandwidth file terminator is found, set end of headers flag
and do not store the line.
If it is not, parse a relay line and check whether it is a header
line.
This commit is contained in:
juga0 2018-06-30 06:16:17 +00:00
parent f906d9be11
commit 87fc409a70
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2600,13 +2600,13 @@ measured_bw_line_apply(measured_bw_line_t *parsed_line,
/** /**
* Read the measured bandwidth list file, apply it to the list of * Read the measured bandwidth list file, apply it to the list of
* vote_routerstatus_t and store all the headers in <b>bwlist_headers</b>. * vote_routerstatus_t and store all the headers in <b>bw_file_headers</b>.
* Returns -1 on error, 0 otherwise. * Returns -1 on error, 0 otherwise.
*/ */
int int
dirserv_read_measured_bandwidths(const char *from_file, dirserv_read_measured_bandwidths(const char *from_file,
smartlist_t *routerstatuses, smartlist_t *routerstatuses,
smartlist_t *bwlist_headers) smartlist_t *bw_file_headers)
{ {
FILE *fp = tor_fopen_cloexec(from_file, "r"); FILE *fp = tor_fopen_cloexec(from_file, "r");
int applied_lines = 0; int applied_lines = 0;
@ -2656,7 +2656,11 @@ dirserv_read_measured_bandwidths(const char *from_file,
goto err; goto err;
} }
smartlist_add_asprintf(bwlist_headers, "timestamp=%ld", file_time); /* 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) if (routerstatuses)
smartlist_sort(routerstatuses, compare_vote_routerstatus_entries); smartlist_sort(routerstatuses, compare_vote_routerstatus_entries);
@ -2673,15 +2677,22 @@ dirserv_read_measured_bandwidths(const char *from_file,
dirserv_cache_measured_bw(&parsed_line, file_time); dirserv_cache_measured_bw(&parsed_line, file_time);
if (measured_bw_line_apply(&parsed_line, routerstatuses) > 0) if (measured_bw_line_apply(&parsed_line, routerstatuses) > 0)
applied_lines++; applied_lines++;
} else { /* if the terminator is found, it is the end of header lines, set the
/* If line does not contain the header separator and it is key_value, * flag but do not store anything */
* it is probably a KeyValue header.*/ } else if (strcmp(line, BW_FILE_TERMINATOR) == 0)
if (strcmp(line, "====\n") != 0 && line_is_after_headers = 1;
string_is_key_value(LOG_DEBUG, line)) { /* if the line was not a correct relay line nor the terminator and
line[strlen(line)-1] = '\0'; * the end of the header lines has not been detected yet
smartlist_add_strdup(bwlist_headers, line); * 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) &&
(smartlist_len(bw_file_headers) < MAX_BW_FILE_HEADERS_LEN)) {
line[strlen(line)-1] = '\0';
smartlist_add_strdup(bw_file_headers, line);
};
} }
} }