nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up ugly constants in connection_dir_download_cert_failed(), and fix a broken one

Browse Source
This commit is contained in:
Andrea Shepard 2013-05-09 08:23:53 -07:00
parent 7b6ee54bdc
commit c0d96bae66
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/directory.c
View File

@ -803,6 +803,8 @@ connection_dir_bridge_routerdesc_failed(dir_connection_t *conn)
static void static void
connection_dir_download_cert_failed(dir_connection_t *conn, int status) connection_dir_download_cert_failed(dir_connection_t *conn, int status)
{ {
const char *fp_pfx = "fp/";
const char *fpsk_pfx = "fp-sk/";
smartlist_t *failed; smartlist_t *failed;
tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE); tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_CERTIFICATE);
@ -814,19 +816,20 @@ connection_dir_download_cert_failed(dir_connection_t *conn, int status)
* with "fp/") or download by fingerprint/signing key pair * with "fp/") or download by fingerprint/signing key pair
* (resource starts with "fp-sk/"). * (resource starts with "fp-sk/").
*/ */
if (!strcmpstart(conn->requested_resource, "fp/")) { if (!strcmpstart(conn->requested_resource, fp_pfx)) {
/* Download by fingerprint case */ /* Download by fingerprint case */
dir_split_resource_into_fingerprints(conn->requested_resource + 3, dir_split_resource_into_fingerprints(conn->requested_resource +
strlen(fp_pfx),
failed, NULL, DSR_HEX); failed, NULL, DSR_HEX);
SMARTLIST_FOREACH_BEGIN(failed, char *, cp) { SMARTLIST_FOREACH_BEGIN(failed, char *, cp) {
/* Null signing key digest indicates download by fp only */ /* Null signing key digest indicates download by fp only */
authority_cert_dl_failed(cp, NULL, status); authority_cert_dl_failed(cp, NULL, status);
tor_free(cp); tor_free(cp);
} SMARTLIST_FOREACH_END(cp); } SMARTLIST_FOREACH_END(cp);
} else if (!strcmpstart(conn->requested_resource, "fp-sk/")) { } else if (!strcmpstart(conn->requested_resource, fpsk_pfx)) {
/* Download by (fp,sk) pairs */ /* Download by (fp,sk) pairs */
dir_split_resource_into_fingerprint_pairs(conn->requested_resource + 5, dir_split_resource_into_fingerprint_pairs(conn->requested_resource +
failed); strlen(fpsk_pfx), failed);
SMARTLIST_FOREACH_BEGIN(failed, fp_pair_t *, cp) { SMARTLIST_FOREACH_BEGIN(failed, fp_pair_t *, cp) {
authority_cert_dl_failed(cp->first, cp->second, status); authority_cert_dl_failed(cp->first, cp->second, status);
tor_free(cp); tor_free(cp);