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

test: Move the origin circuit function to test helpers

Browse Source 
Part of 33222.
This commit is contained in:
teor 2020-05-14 10:44:56 +10:00
parent 9949b545c8
commit d41d13ea73
3 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/test/test_circuitstats.c
View File

@ -16,19 +16,11 @@
#include "core/or/circuitstats.h"
#include "core/or/circuituse.h"
#include "core/or/channel.h"
#include "core/or/crypt_path.h"
#include "core/or/cpath_build_state_st.h"
#include "core/or/crypt_path_st.h"
#include "core/or/extend_info_st.h"
#include "core/or/origin_circuit_st.h"
static origin_circuit_t *new_test_origin_circuit(
bool has_opened,
struct timeval circ_start_time,
int path_len,
extend_info_t **ei_list);
static origin_circuit_t *add_opened_threehop(void);
static origin_circuit_t *build_unopened_fourhop(struct timeval);
static origin_circuit_t *subtest_fourhop_circuit(struct timeval, int);
@ -48,37 +40,6 @@ mock_circuit_mark_for_close(circuit_t *circ, int reason, int line,
return;
}
static origin_circuit_t *
new_test_origin_circuit(bool has_opened,
struct timeval circ_start_time,
int path_len,
extend_info_t **ei_list)
{
origin_circuit_t *origin_circ = origin_circuit_new();
TO_CIRCUIT(origin_circ)->purpose = CIRCUIT_PURPOSE_C_GENERAL;
origin_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t));
origin_circ->build_state->desired_path_len = path_len;
if (ei_list) {
for (int i = 0; i < path_len; i++) {
extend_info_t *ei = ei_list[i];
cpath_append_hop(&origin_circ->cpath, ei);
}
}
if (has_opened) {
origin_circ->has_opened = 1;
TO_CIRCUIT(origin_circ)->state = CIRCUIT_STATE_OPEN;
} else {
TO_CIRCUIT(origin_circ)->timestamp_began = circ_start_time;
TO_CIRCUIT(origin_circ)->timestamp_created = circ_start_time;
}
return origin_circ;
}
static origin_circuit_t *
add_opened_threehop(void)
{

61
src/test/test_helpers.c
View File

@ -16,28 +16,34 @@
#include "core/or/or.h"
#include "lib/buf/buffers.h"
#include "app/config/config.h"
#include "lib/confmgt/confmgt.h"
#include "app/main/subsysmgr.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_or.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/relay.h"
#include "feature/nodelist/routerlist.h"
#include "lib/dispatch/dispatch.h"
#include "lib/dispatch/dispatch_naming.h"
#include "lib/pubsub/pubsub_build.h"
#include "lib/pubsub/pubsub_connect.h"
#include "lib/encoding/confline.h"
#include "lib/net/resolve.h"
#include "lib/pubsub/pubsub_build.h"
#include "lib/pubsub/pubsub_connect.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/connection_or.h"
#include "core/or/crypt_path.h"
#include "core/or/relay.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h"
#include "app/config/config.h"
#include "app/main/subsysmgr.h"
#include "core/or/cell_st.h"
#include "core/or/connection_st.h"
#include "core/or/or_connection_st.h"
#include "feature/nodelist/node_st.h"
#include "core/or/cpath_build_state_st.h"
#include "core/or/origin_circuit_st.h"
#include "core/or/or_connection_st.h"
#include "feature/nodelist/node_st.h"
#include "feature/nodelist/routerlist_st.h"
#include "test/test.h"
@ -441,3 +447,34 @@ helper_cleanup_pubsub(const struct testcase_t *testcase, void *dispatcher_)
const struct testcase_setup_t helper_pubsub_setup = {
helper_setup_pubsub, helper_cleanup_pubsub
};
origin_circuit_t *
new_test_origin_circuit(bool has_opened,
struct timeval circ_start_time,
int path_len,
extend_info_t **ei_list)
{
origin_circuit_t *origin_circ = origin_circuit_new();
TO_CIRCUIT(origin_circ)->purpose = CIRCUIT_PURPOSE_C_GENERAL;
origin_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t));
origin_circ->build_state->desired_path_len = path_len;
if (ei_list) {
for (int i = 0; i < path_len; i++) {
extend_info_t *ei = ei_list[i];
cpath_append_hop(&origin_circ->cpath, ei);
}
}
if (has_opened) {
origin_circ->has_opened = 1;
TO_CIRCUIT(origin_circ)->state = CIRCUIT_STATE_OPEN;
} else {
TO_CIRCUIT(origin_circ)->timestamp_began = circ_start_time;
TO_CIRCUIT(origin_circ)->timestamp_created = circ_start_time;
}
return origin_circ;
}

5
src/test/test_helpers.h
View File

@ -40,5 +40,10 @@ int helper_cleanup_pubsub(const struct testcase_t *, void *);
extern const struct testcase_setup_t helper_pubsub_setup;
origin_circuit_t *new_test_origin_circuit(bool has_opened,
struct timeval circ_start_time,
int path_len,
extend_info_t **ei_list);
#endif /* !defined(TOR_TEST_HELPERS_H) */