diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-31 14:32:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-31 14:32:24 -0500 |
| commit | 98dd3757bfa2111707f6fe9cde7e1ece88825821 (patch) | |
| tree | 7dd6f21517475f6b8db6f347734269600c5e60a8 /src/test | |
| parent | 0dc1595d0359dbf51ad24fe8bbadb5ab41fb9eb9 (diff) | |
| parent | 3d937043c2961923f9c28152615dc591997328f0 (diff) | |
| download | tor-98dd3757bfa2111707f6fe9cde7e1ece88825821.tar.gz tor-98dd3757bfa2111707f6fe9cde7e1ece88825821.zip | |
Merge branch 'bug25008'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_hs_common.c | 2 | ||||
| -rw-r--r-- | src/test/test_hs_service.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 21daa58abd..8c273c9639 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -289,7 +289,7 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, memcpy(rs->identity_digest, identity, DIGEST_LEN); rs->is_hs_dir = is_hsdir; - rs->supports_v3_hsdir = 1; + rs->pv.supports_v3_hsdir = 1; strlcpy(rs->nickname, nickname, sizeof(rs->nickname)); tor_addr_parse(&ipv4_addr, "1.2.3.4"); ri->addr = tor_addr_to_ipv4h(&ipv4_addr); diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 3e3a7d8e0d..fad65e61f7 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -20,6 +20,7 @@ #define STATEFILE_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define HS_CLIENT_PRIVATE +#define ROUTERPARSE_PRIVATE #include "test.h" #include "test_helpers.h" @@ -37,6 +38,7 @@ #include "networkstatus.h" #include "nodelist.h" #include "relay.h" +#include "routerparse.h" #include "hs_common.h" #include "hs_config.h" @@ -1210,6 +1212,7 @@ test_build_update_descriptors(void *arg) /* Ugly yes but we never free the "ri" object so this just makes things * easier. */ ri.protocol_list = (char *) "HSDir=1-2 LinkAuth=3"; + summarize_protover_flags(&ri.pv, ri.protocol_list, NULL); ret = curve25519_secret_key_generate(&curve25519_secret_key, 0); tt_int_op(ret, OP_EQ, 0); ri.onion_curve25519_pkey = |