commit b10b2875898887f74e1018343c2c25ac376ff335 Author: teor <teor@torproject.org> Date: Wed Apr 1 21:37:47 2020 +1000 relay: Make circuitbuild functions STATIC Allow the circuitbuild_relay functions to be accessed by the unit tests. Part of 33633. --- src/feature/relay/circuitbuild_relay.c | 14 +++++++------- src/feature/relay/circuitbuild_relay.h | 13 +++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c index a9c7378fe..5c3f0d7d2 100644 --- a/src/feature/relay/circuitbuild_relay.c +++ b/src/feature/relay/circuitbuild_relay.c @@ -45,7 +45,7 @@ * If the state and mode are valid, return 0. * Otherwise, if they are invalid, log a protocol warning, and return -1. */ -static int +STATIC int circuit_extend_state_valid_helper(const struct circuit_t *circ) { if (!server_mode(get_options())) { @@ -78,8 +78,8 @@ circuit_extend_state_valid_helper(const struct circuit_t *circ) * * Must be called before circuit_extend_lspec_valid_helper(). */ -static int -circuit_extend_add_ed25519_helper(extend_cell_t *ec) +STATIC int +circuit_extend_add_ed25519_helper(struct extend_cell_t *ec) { /* Check if they asked us for 0000..0000. We support using * an empty fingerprint for the first hop (e.g. for a bridge relay), @@ -116,8 +116,8 @@ circuit_extend_add_ed25519_helper(extend_cell_t *ec) * * Must be called after circuit_extend_add_ed25519_helper(). */ -static int -circuit_extend_lspec_valid_helper(const extend_cell_t *ec, +STATIC int +circuit_extend_lspec_valid_helper(const struct extend_cell_t *ec, const struct circuit_t *circ) { if (!ec->orport_ipv4.port || tor_addr_is_null(&ec->orport_ipv4.addr)) { @@ -161,8 +161,8 @@ circuit_extend_lspec_valid_helper(const extend_cell_t *ec, * is true, open a new connection. (Otherwise, we are already waiting for a * new connection to the same relay.) */ -static void -circuit_open_connection_for_extend(const extend_cell_t *ec, +STATIC void +circuit_open_connection_for_extend(const struct extend_cell_t *ec, struct circuit_t *circ, int should_launch) { diff --git a/src/feature/relay/circuitbuild_relay.h b/src/feature/relay/circuitbuild_relay.h index 890b40dc2..19dbc4b94 100644 --- a/src/feature/relay/circuitbuild_relay.h +++ b/src/feature/relay/circuitbuild_relay.h @@ -22,6 +22,7 @@ struct created_cell_t; struct circuit_t; struct or_circuit_t; +struct extend_cell_t; /* Log a protocol warning about getting an extend cell on a client. */ static inline void @@ -68,4 +69,16 @@ onionskin_answer(struct or_circuit_t *circ, #endif +#ifdef TOR_UNIT_TESTS + +STATIC int circuit_extend_state_valid_helper(const struct circuit_t *circ); +STATIC int circuit_extend_add_ed25519_helper(struct extend_cell_t *ec); +STATIC int circuit_extend_lspec_valid_helper(const struct extend_cell_t *ec, + const struct circuit_t *circ); +STATIC void circuit_open_connection_for_extend(const struct extend_cell_t *ec, + struct circuit_t *circ, + int should_launch); + +#endif + #endif /* !defined(TOR_FEATURE_RELAY_CIRCUITBUILD_RELAY_H) */