aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNeel Chauhan <neel@neelc.org>2018-04-27 19:14:59 +0000
committerNick Mathewson <nickm@torproject.org>2018-05-01 08:51:16 -0400
commit5458ff20a5a8d76c6e8abe80167bd84fa157038f (patch)
tree8334d14a6e0560a340c0cf4d85f9fc4e198f7f91 /src/or/directory.c
parentddb2b965dec20e105eae02b848d6c82359c21132 (diff)
downloadtor-5458ff20a5a8d76c6e8abe80167bd84fa157038f.tar.gz
tor-5458ff20a5a8d76c6e8abe80167bd84fa157038f.zip
Remove the return value from the fascist_firewall_choose_address_* family of functions
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index c419b61d02..d6ce9290a1 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -794,9 +794,9 @@ directory_choose_address_routerstatus(const routerstatus_t *status,
* Use the preferred address and port if they are reachable, otherwise,
* use the alternate address and port (if any).
*/
- have_or = fascist_firewall_choose_address_rs(status,
- FIREWALL_OR_CONNECTION, 0,
- use_or_ap);
+ fascist_firewall_choose_address_rs(status, FIREWALL_OR_CONNECTION, 0,
+ use_or_ap);
+ have_or = tor_addr_port_is_valid_ap(use_or_ap, 0);
}
/* DirPort connections
@@ -805,9 +805,9 @@ directory_choose_address_routerstatus(const routerstatus_t *status,
indirection == DIRIND_ANON_DIRPORT ||
(indirection == DIRIND_ONEHOP
&& !directory_must_use_begindir(options))) {
- have_dir = fascist_firewall_choose_address_rs(status,
- FIREWALL_DIR_CONNECTION, 0,
- use_dir_ap);
+ fascist_firewall_choose_address_rs(status, FIREWALL_DIR_CONNECTION, 0,
+ use_dir_ap);
+ have_dir = tor_addr_port_is_valid_ap(use_dir_ap, 0);
}
/* We rejected all addresses in the relay's status. This means we can't