Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mike Perry
Tor
Commits
bc44e6f5
Commit
bc44e6f5
authored
Nov 04, 2021
by
Mike Perry
Browse files
Extend info argument updates for non-ntorv3 cases
parent
a78d873c
Pipeline
#16634
skipped
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/feature/hs/hs_common.c
View file @
bc44e6f5
...
...
@@ -1698,7 +1698,7 @@ hs_get_extend_info_from_lspecs(const smartlist_t *lspecs,
function that needs to initialize congestion
control structures based on what the client says.
*/
NULL
);
NULL
,
false
);
done:
return
info
;
}
...
...
src/feature/hs/hs_service.c
View file @
bc44e6f5
...
...
@@ -714,7 +714,7 @@ get_extend_info_from_intro_point(const hs_service_intro_point_t *ip,
/* In the case of a direct connection (single onion service), it is possible
* our firewall policy won't allow it so this can return a NULL value. */
info
=
extend_info_from_node
(
node
,
direct_conn
);
info
=
extend_info_from_node
(
node
,
direct_conn
,
false
);
end:
return
info
;
...
...
src/feature/relay/circuitbuild_relay.c
View file @
bc44e6f5
...
...
@@ -393,7 +393,8 @@ circuit_open_connection_for_extend(const struct extend_cell_t *ec,
NULL
,
/*curve25519_key*/
&
chosen_ap
->
addr
,
chosen_ap
->
port
,
NULL
/* protover summary */
);
NULL
/* protover summary */
,
false
);
circ
->
n_chan_create_cell
=
tor_memdup
(
&
ec
->
create_cell
,
sizeof
(
ec
->
create_cell
));
...
...
src/feature/relay/relay_find_addr.c
View file @
bc44e6f5
...
...
@@ -221,7 +221,7 @@ relay_addr_learn_from_dirauth(void)
"learn for now our address from them."
);
return
;
}
extend_info_t
*
ei
=
extend_info_from_node
(
node
,
1
);
extend_info_t
*
ei
=
extend_info_from_node
(
node
,
1
,
false
);
if
(
BUG
(
!
ei
))
{
return
;
}
...
...
src/feature/relay/selftest.c
View file @
bc44e6f5
...
...
@@ -229,7 +229,9 @@ extend_info_from_router(const routerinfo_t *r, int family)
ed_id_key
,
rsa_pubkey
,
r
->
onion_curve25519_pkey
,
&
ap
.
addr
,
ap
.
port
,
NULL
/* should self-tests use ntor3? */
);
/* TODO-324: Should self-test circuits use
* congestion control? */
NULL
,
false
);
crypto_pk_free
(
rsa_pubkey
);
return
info
;
}
...
...
src/test/test_circuitpadding.c
View file @
bc44e6f5
...
...
@@ -1609,7 +1609,7 @@ simulate_single_hop_extend(circuit_t *client, circuit_t *mid_relay,
hop
->
extend_info
=
extend_info_new
(
padding
?
"padding"
:
"non-padding"
,
digest
,
NULL
,
NULL
,
NULL
,
&
addr
,
padding
,
NULL
);
&
addr
,
padding
,
NULL
,
false
);
cpath_init_circuit_crypto
(
hop
,
whatevs_key
,
sizeof
(
whatevs_key
),
0
,
0
);
...
...
src/test/test_hs_client.c
View file @
bc44e6f5
...
...
@@ -1186,7 +1186,7 @@ test_socks_hs_errors(void *arg)
/* Code path will log this exit so build it. */
ocirc
->
build_state
->
chosen_exit
=
extend_info_new
(
"TestNickname"
,
digest
,
NULL
,
NULL
,
NULL
,
&
addr
,
4242
,
NULL
);
4242
,
NULL
,
false
);
/* Attach socks connection to this rendezvous circuit. */
ocirc
->
p_streams
=
ENTRY_TO_EDGE_CONN
(
socks_conn
);
/* Trigger the rendezvous failure. Timeout the circuit and free. */
...
...
@@ -1281,7 +1281,7 @@ test_close_intro_circuit_failure(void *arg)
/* Code path will log this exit so build it. */
ocirc
->
build_state
->
chosen_exit
=
extend_info_new
(
"TestNickname"
,
digest
,
NULL
,
NULL
,
NULL
,
&
addr
,
4242
,
NULL
);
4242
,
NULL
,
false
);
ed25519_pubkey_copy
(
&
ocirc
->
hs_ident
->
intro_auth_pk
,
&
intro_kp
.
pubkey
);
/* We'll make for close the circuit for a timeout failure. It should _NOT_
...
...
@@ -1308,7 +1308,7 @@ test_close_intro_circuit_failure(void *arg)
/* Code path will log this exit so build it. */
ocirc
->
build_state
->
chosen_exit
=
extend_info_new
(
"TestNickname"
,
digest
,
NULL
,
NULL
,
NULL
,
&
addr
,
4242
,
NULL
);
4242
,
NULL
,
false
);
ed25519_pubkey_copy
(
&
ocirc
->
hs_ident
->
intro_auth_pk
,
&
intro_kp
.
pubkey
);
/* On free, we should get an unreachable failure. */
...
...
@@ -1331,7 +1331,7 @@ test_close_intro_circuit_failure(void *arg)
/* Code path will log this exit so build it. */
ocirc
->
build_state
->
chosen_exit
=
extend_info_new
(
"TestNickname"
,
digest
,
NULL
,
NULL
,
NULL
,
&
addr
,
4242
,
NULL
);
4242
,
NULL
,
false
);
ed25519_pubkey_copy
(
&
ocirc
->
hs_ident
->
intro_auth_pk
,
&
intro_kp
.
pubkey
);
circuit_mark_for_close
(
circ
,
END_CIRC_REASON_TIMEOUT
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment