diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-08 17:52:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-08 17:52:45 -0500 |
| commit | 241b676638285e63bd6e4ca5225444a4b16207be (patch) | |
| tree | 7d6613c3fdf2d2b7c954974981d99abaee3668b0 /src/test/test_circuitstats.c | |
| parent | 0340c02975a51410525507b92ee0b7f9e6e9d6f7 (diff) | |
| download | tor-241b676638285e63bd6e4ca5225444a4b16207be.tar.gz tor-241b676638285e63bd6e4ca5225444a4b16207be.zip | |
Fix up test_circuitstats to use the new circuit_free macro
Diffstat (limited to 'src/test/test_circuitstats.c')
| -rw-r--r-- | src/test/test_circuitstats.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test_circuitstats.c b/src/test/test_circuitstats.c index 1c6a2ba28f..9d87c325b4 100644 --- a/src/test/test_circuitstats.c +++ b/src/test/test_circuitstats.c @@ -3,6 +3,7 @@ #define CIRCUITBUILD_PRIVATE #define CIRCUITSTATS_PRIVATE +#define CIRCUITLIST_PRIVATE #define CHANNEL_PRIVATE_ #include "or.h" @@ -22,7 +23,6 @@ origin_circuit_t *subtest_fourhop_circuit(struct timeval, int); origin_circuit_t *add_opened_threehop(void); origin_circuit_t *build_unopened_fourhop(struct timeval); -void circuit_free(circuit_t *circ); int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); static int marked_for_close; @@ -153,7 +153,7 @@ test_circuitstats_hoplen(void *arg) tt_int_op(get_circuit_build_times()->total_build_times, OP_EQ, 1); tt_int_op(marked_for_close, OP_EQ, 1); - circuit_free(TO_CIRCUIT(fourhop)); + circuit_free_(TO_CIRCUIT(fourhop)); circuit_build_times_reset(get_circuit_build_times_mutable()); // Test 2: Add a threehop circuit for non-relaxed timeouts @@ -168,7 +168,7 @@ test_circuitstats_hoplen(void *arg) tt_int_op(TO_CIRCUIT(fourhop)->purpose, OP_NE, CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT); - circuit_free((circuit_t *)fourhop); + circuit_free_((circuit_t *)fourhop); circuit_build_times_reset(get_circuit_build_times_mutable()); /* Test 3: This circuit should now time out and get marked as a @@ -184,8 +184,8 @@ test_circuitstats_hoplen(void *arg) done: UNMOCK(circuit_mark_for_close_); - circuit_free(TO_CIRCUIT(threehop)); - circuit_free(TO_CIRCUIT(fourhop)); + circuit_free_(TO_CIRCUIT(threehop)); + circuit_free_(TO_CIRCUIT(fourhop)); circuit_build_times_free_timeouts(get_circuit_build_times_mutable()); } |