nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

relay: Make circuitbuild functions STATIC

Browse Source 
Allow the circuitbuild_relay functions to be accessed by the unit tests.

Part of 33633.
This commit is contained in:
teor 2020-04-01 21:37:47 +10:00
parent 44f634d0be
commit b10b287589
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/feature/relay/circuitbuild_relay.c
View File

@ -45,7 +45,7 @@
* If the state and mode are valid, return 0. * If the state and mode are valid, return 0.
* Otherwise, if they are invalid, log a protocol warning, and return -1. * 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) circuit_extend_state_valid_helper(const struct circuit_t *circ)
{ {
if (!server_mode(get_options())) { 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(). * Must be called before circuit_extend_lspec_valid_helper().
*/ */
static int STATIC int
circuit_extend_add_ed25519_helper(extend_cell_t *ec) circuit_extend_add_ed25519_helper(struct extend_cell_t *ec)
{ {
/* Check if they asked us for 0000..0000. We support using /* Check if they asked us for 0000..0000. We support using
* an empty fingerprint for the first hop (e.g. for a bridge relay), * 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(). * Must be called after circuit_extend_add_ed25519_helper().
*/ */
static int STATIC int
circuit_extend_lspec_valid_helper(const extend_cell_t *ec, circuit_extend_lspec_valid_helper(const struct extend_cell_t *ec,
const struct circuit_t *circ) const struct circuit_t *circ)
{ {
if (!ec->orport_ipv4.port || tor_addr_is_null(&ec->orport_ipv4.addr)) { 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 * is true, open a new connection. (Otherwise, we are already waiting for a
* new connection to the same relay.) * new connection to the same relay.)
*/ */
static void STATIC void
circuit_open_connection_for_extend(const extend_cell_t *ec, circuit_open_connection_for_extend(const struct extend_cell_t *ec,
struct circuit_t *circ, struct circuit_t *circ,
int should_launch) int should_launch)
{ {

13
src/feature/relay/circuitbuild_relay.h
View File

@ -22,6 +22,7 @@ struct created_cell_t;
struct circuit_t; struct circuit_t;
struct or_circuit_t; struct or_circuit_t;
struct extend_cell_t;
/* Log a protocol warning about getting an extend cell on a client. */ /* Log a protocol warning about getting an extend cell on a client. */
static inline void static inline void
@ -68,4 +69,16 @@ onionskin_answer(struct or_circuit_t *circ,
#endif #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) */ #endif /* !defined(TOR_FEATURE_RELAY_CIRCUITBUILD_RELAY_H) */