commit 900994e46abc8049069fc285af54928eeba51d19 Author: teor teor@torproject.org Date: Thu Apr 30 15:53:29 2020 +1000

relay: Remove unused DirPort self-test code

DIRIND_ANON_DIRPORT never uses our ORPort, so we don't need to set it in the directory request.

Part of 33222. --- src/feature/relay/selftest.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 5fc23b7e1..c3c75c899 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -206,15 +206,12 @@ router_do_reachability_checks(int test_or, int test_dir) !connection_get_by_type_addr_port_purpose( CONN_TYPE_DIR, &addr, me->dir_port, DIR_PURPOSE_FETCH_SERVERDESC)) { - tor_addr_port_t my_orport, my_dirport; - memcpy(&my_orport.addr, &addr, sizeof(addr)); + tor_addr_port_t my_dirport; memcpy(&my_dirport.addr, &addr, sizeof(addr)); - my_orport.port = me->or_port; my_dirport.port = me->dir_port; /* ask myself, via tor, for my server descriptor. */ directory_request_t *req = directory_request_new(DIR_PURPOSE_FETCH_SERVERDESC); - directory_request_set_or_addr_port(req, &my_orport); directory_request_set_dir_addr_port(req, &my_dirport); directory_request_set_directory_id_digest(req, me->cache_info.identity_digest);