mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Rename, revise, and document directory_request_is_dir_specified.

Browse source
This commit is contained in:
Nick Mathewson 2017-04-21 15:37:38 -04:00
parent d7fab36037
commit 900d36e3b1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/or/directory.c
View file

@ -1210,12 +1210,17 @@ directory_request_set_guard_state(directory_request_t *req,
req->guard_state = state;
}
/**
* Internal: Return true if any information for contacting the directory in
* <b>req</b> has been set, other than by the routerstatus. */
static int
directory_request_is_dir_specified(const directory_request_t *req)
directory_request_dir_contact_info_specified(const directory_request_t *req)
{
// XXXX inline and revise
return (req->or_addr_port.port || req->dir_addr_port.port) &&
! tor_digest_is_zero(req->digest);
/* We only check for ports here, since we don't use an addr unless the port
* is set */
return (req->or_addr_port.port ||
req->dir_addr_port.port ||
! tor_digest_is_zero(req->digest));
}
/**
@ -1301,7 +1306,8 @@ directory_initiate_request,(directory_request_t *request))
{
tor_assert(request);
if (request->routerstatus) {
tor_assert_nonfatal(! directory_request_is_dir_specified(request));
tor_assert_nonfatal(
! directory_request_dir_contact_info_specified(request));
if (directory_request_set_dir_from_routerstatus(request) < 0) {
return;
}