diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-09-14 16:31:48 -0400 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2022-02-22 19:28:33 +0000 |
| commit | baaabb503c9c9fc81e0d95b2d5baeefef7423b7a (patch) | |
| tree | 3ca1259e597855b96b53a73f8690b18edbc737dc /src/feature | |
| parent | bd2e9a44097ff85934bc1c34f4fce2017a7a92c8 (diff) | |
| download | tor-baaabb503c9c9fc81e0d95b2d5baeefef7423b7a.tar.gz tor-baaabb503c9c9fc81e0d95b2d5baeefef7423b7a.zip | |
Use protover to signal support for ntor3 + congestion control.
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/hs/hs_common.c | 6 | ||||
| -rw-r--r-- | src/feature/nodelist/nodelist.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/circuitbuild_relay.c | 3 | ||||
| -rw-r--r-- | src/feature/relay/selftest.c | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index c9195c2934..ee4ec25b01 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1687,7 +1687,11 @@ hs_get_extend_info_from_lspecs(const smartlist_t *lspecs, /* We do have everything for which we think we can connect successfully. */ info = extend_info_new(NULL, legacy_id, (have_ed25519_id) ? &ed25519_pk : NULL, NULL, - onion_key, &ap.addr, ap.port); + onion_key, &ap.addr, ap.port, + /* TODO: The protover summary here needs to explain + if we support the newer congestion control or + not. This may require new specification stuff */ + NULL); done: return info; } diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index c676e8dfb4..b895a2c7f8 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1205,7 +1205,7 @@ node_ed25519_id_matches(const node_t *node, const ed25519_public_key_t *id) /** Dummy object that should be unreturnable. Used to ensure that * node_get_protover_summary_flags() always returns non-NULL. */ static const protover_summary_flags_t zero_protover_flags = { - 0,0,0,0,0,0,0,0,0,0,0,0 + 0,0,0,0,0,0,0,0,0,0,0,0,0 }; /** Return the protover_summary_flags for a given node. */ diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c index 2d346b1809..af3b488ae1 100644 --- a/src/feature/relay/circuitbuild_relay.c +++ b/src/feature/relay/circuitbuild_relay.c @@ -392,7 +392,8 @@ circuit_open_connection_for_extend(const struct extend_cell_t *ec, NULL, /*onion_key*/ NULL, /*curve25519_key*/ &chosen_ap->addr, - chosen_ap->port); + chosen_ap->port, + NULL /* protover summary */); circ->n_chan_create_cell = tor_memdup(&ec->create_cell, sizeof(ec->create_cell)); diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index d029c05053..d52fea3c11 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -228,7 +228,8 @@ extend_info_from_router(const routerinfo_t *r, int family) info = extend_info_new(r->nickname, r->cache_info.identity_digest, ed_id_key, rsa_pubkey, r->onion_curve25519_pkey, - &ap.addr, ap.port); + &ap.addr, ap.port, + NULL /* should self-tests use ntor3? */); crypto_pk_free(rsa_pubkey); return info; } |