torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove the extraneous dir_port variable

Browse Source 
we already are using "port" to describe the place we're going to
ask to connect to.
This commit is contained in:
Roger Dingledine
2016-03-24 19:05:36 -04:00
parent fbd79f38c2
commit 98abd49f6f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/directory.c
+2 -4
View File
@@ -1079,8 +1079,6 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
tor_addr_t addr;
tor_addr_copy(&addr, &(use_begindir ? or_addr_port : dir_addr_port)->addr);
uint16_t port = (use_begindir ? or_addr_port : dir_addr_port)->port;
/* XXX dir_port is redundant and we can get rid of it. Just use port. */
uint16_t dir_port = dir_addr_port->port;
log_debug(LD_DIR, "anonymized %d, use_begindir %d.",
anonymized_connection, use_begindir);
@@ -1150,11 +1148,11 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
if (options->HTTPProxy) {
tor_addr_copy(&addr, &options->HTTPProxyAddr);
dir_port = options->HTTPProxyPort;
port = options->HTTPProxyPort;
}
switch (connection_connect(TO_CONN(conn), conn->base_.address, &addr,
dir_port, &socket_error)) {
port, &socket_error)) {
case -1:
connection_mark_for_close(TO_CONN(conn));
return;