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

Refactor directory_command_should_use_begindir to use directory_request_t

Browse Source
This commit is contained in:
Nick Mathewson 2017-04-21 15:55:23 -04:00
parent 2a99bf008d
commit d8ff01b2b4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/or/directory.c
View File

@ -1007,12 +1007,16 @@ struct directory_request_t {
*/ */
static int static int
directory_command_should_use_begindir(const or_options_t *options, directory_command_should_use_begindir(const or_options_t *options,
const tor_addr_t *or_addr, int or_port, const directory_request_t *req,
const tor_addr_t *dir_addr, int dir_port,
dir_indirection_t indirection,
const char **reason) const char **reason)
{ {
(void)dir_addr; const tor_addr_t *or_addr = &req->or_addr_port.addr;
//const tor_addr_t *dir_addr = &req->dir_addr_port.addr;
const int or_port = req->or_addr_port.port;
const int dir_port = req->dir_addr_port.port;
const dir_indirection_t indirection = req->indirection;
tor_assert(reason); tor_assert(reason);
*reason = NULL; *reason = NULL;
@ -1331,11 +1335,8 @@ directory_initiate_request,(directory_request_t *request))
const char *begindir_reason = NULL; const char *begindir_reason = NULL;
/* Should the connection be to a relay's OR port (and inside that we will /* Should the connection be to a relay's OR port (and inside that we will
* send our directory request)? */ * send our directory request)? */
const int use_begindir = directory_command_should_use_begindir(options, const int use_begindir =
&or_addr_port->addr, or_addr_port->port, directory_command_should_use_begindir(options, request, &begindir_reason);
&dir_addr_port->addr, dir_addr_port->port,
indirection,
&begindir_reason);
/* Will the connection go via a three-hop Tor circuit? Note that this /* Will the connection go via a three-hop Tor circuit? Note that this
* is separate from whether it will use_begindir. */ * is separate from whether it will use_begindir. */