diff options
author | George Kadianakis <desnacked@riseup.net> | 2019-05-10 12:49:01 +0300 |
---|---|---|
committer | George Kadianakis <desnacked@riseup.net> | 2019-05-10 12:49:01 +0300 |
commit | 501d1ae0bd4638730c1ba050c9ddb47d7c438280 (patch) | |
tree | 802034b41b2566c448d02f4593913de5bc1b127e /src/test/test_hs_client.c | |
parent | 3885e7b44b1df421aa062ba2598f1731e4e3e3a5 (diff) | |
parent | de91b838496a3646721608bdb7740696601f57c4 (diff) | |
download | tor-501d1ae0bd4638730c1ba050c9ddb47d7c438280.tar.gz tor-501d1ae0bd4638730c1ba050c9ddb47d7c438280.zip |
Merge branch 'tor-github/pr/973'
Diffstat (limited to 'src/test/test_hs_client.c')
-rw-r--r-- | src/test/test_hs_client.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index f8300c6d41..0d25a98bb3 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -485,6 +485,17 @@ test_client_pick_intro(void *arg) SMARTLIST_FOREACH_BEGIN(desc->encrypted_data.intro_points, hs_desc_intro_point_t *, ip) { extend_info_t *intro_ei = desc_intro_point_to_extend_info(ip); + /* desc_intro_point_to_extend_info() doesn't return IPv6 intro points + * yet, because we can't extend to them. See #24404, #24451, and #24181. + */ + if (intro_ei == NULL) { + /* Pretend we're making a direct connection, and that we can use IPv6 + */ + get_options_mutable()->ClientUseIPv6 = 1; + intro_ei = hs_get_extend_info_from_lspecs(ip->link_specifiers, + &ip->onion_key, 1); + tt_assert(tor_addr_family(&intro_ei->addr) == AF_INET6); + } tt_assert(intro_ei); if (intro_ei) { const char *ptr; |