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

Fix unit tests.

Browse Source
This commit is contained in:
Mike Perry 2023-05-10 21:56:52 +00:00
parent a340acb492
commit 0c11577987
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/or/conflux_pool.c
View File

@ -130,6 +130,11 @@ get_linked_pool(bool is_client)
} }
#endif #endif
/* For unit tests only: please treat these exactly as the defines in the
* code. */
STATIC uint8_t DEFAULT_CLIENT_UX = CONFLUX_UX_HIGH_THROUGHPUT;
STATIC uint8_t DEFAULT_EXIT_UX = CONFLUX_UX_MIN_LATENCY;
/** Helper: Format at 8 bytes the nonce for logging. */ /** Helper: Format at 8 bytes the nonce for logging. */
static inline const char * static inline const char *
fmt_nonce(const uint8_t *nonce) fmt_nonce(const uint8_t *nonce)
@ -1111,7 +1116,7 @@ conflux_launch_leg(const uint8_t *nonce)
leg_t *leg = leg_new(TO_CIRCUIT(circ), leg_t *leg = leg_new(TO_CIRCUIT(circ),
conflux_cell_new_link(nonce, conflux_cell_new_link(nonce,
last_seq_sent, last_seq_recv, last_seq_sent, last_seq_recv,
CONFLUX_UX_HIGH_THROUGHPUT)); DEFAULT_CLIENT_UX));
/* Increase the retry count for this conflux object as in this nonce. */ /* Increase the retry count for this conflux object as in this nonce. */
unlinked->cfx->num_leg_launch++; unlinked->cfx->num_leg_launch++;
@ -1765,7 +1770,7 @@ conflux_process_link(circuit_t *circ, const cell_t *cell,
/* Exits should always request min latency from clients */ /* Exits should always request min latency from clients */
conflux_cell_link_t *linked = conflux_cell_new_link(nonce, last_seq_sent, conflux_cell_link_t *linked = conflux_cell_new_link(nonce, last_seq_sent,
last_seq_recv, last_seq_recv,
CONFLUX_UX_MIN_LATENCY); DEFAULT_EXIT_UX);
conflux_cell_send_linked(linked, TO_OR_CIRCUIT(circ)); conflux_cell_send_linked(linked, TO_OR_CIRCUIT(circ));
tor_free(linked); tor_free(linked);

2
src/core/or/conflux_pool.h
View File

@ -40,6 +40,8 @@ void conflux_process_linked_ack(circuit_t *circ);
bool launch_new_set(int num_legs); bool launch_new_set(int num_legs);
digest256map_t *get_linked_pool(bool is_client); digest256map_t *get_linked_pool(bool is_client);
digest256map_t *get_unlinked_pool(bool is_client); digest256map_t *get_unlinked_pool(bool is_client);
extern uint8_t DEFAULT_CLIENT_UX;
extern uint8_t DEFAULT_EXIT_UX;
#endif /* defined(UNIT_TESTS) */ #endif /* defined(UNIT_TESTS) */
#endif /* TOR_CONFLUX_POOL_H */ #endif /* TOR_CONFLUX_POOL_H */

2
src/test/test_conflux_pool.c
View File

@ -53,6 +53,7 @@
#include "core/or/conflux_params.h" #include "core/or/conflux_params.h"
#include "core/or/conflux.h" #include "core/or/conflux.h"
#include "core/or/conflux_st.h" #include "core/or/conflux_st.h"
#include "trunnel/conflux.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
/* Start our monotime mocking at 1 second past whatever monotime_init() /* Start our monotime mocking at 1 second past whatever monotime_init()
@ -1112,6 +1113,7 @@ test_conflux_switch(void *arg)
{ {
(void) arg; (void) arg;
test_setup(); test_setup();
DEFAULT_EXIT_UX = CONFLUX_UX_HIGH_THROUGHPUT;
launch_new_set(2); launch_new_set(2);