diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-20 14:41:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-20 14:41:44 -0400 |
| commit | 813019cc57844876fcc63d87510b8efbcbf80563 (patch) | |
| tree | 9e6c751dc96ef2f6889fd441e5ec6096ccaae2dc /src/test/test_relay.c | |
| parent | a406255cf395b053d6216df4252ad1320ab73a54 (diff) | |
| parent | 1da9741bca8b16e8c5f15d91f646ee1ea4985750 (diff) | |
| download | tor-813019cc57844876fcc63d87510b8efbcbf80563.tar.gz tor-813019cc57844876fcc63d87510b8efbcbf80563.zip | |
Merge branch 'bug23512-v4-029-fixes'
Diffstat (limited to 'src/test/test_relay.c')
| -rw-r--r-- | src/test/test_relay.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test_relay.c b/src/test/test_relay.c index c3fd6578e1..4311392be8 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -1,14 +1,17 @@ /* Copyright (c) 2014-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "core/or/or.h" #define CIRCUITBUILD_PRIVATE +#define RELAY_PRIVATE +#define REPHIST_PRIVATE +#include "core/or/or.h" #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/channeltls.h" #include "feature/stats/rephist.h" -#define RELAY_PRIVATE #include "core/or/relay.h" +#include "feature/stats/rephist.h" +#include "lib/container/order.h" /* For init/free stuff */ #include "core/or/scheduler.h" @@ -22,9 +25,6 @@ static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan); static void test_relay_append_cell_to_circuit_queue(void *arg); -uint64_t find_largest_max(bw_array_t *b); -void commit_max(bw_array_t *b); -void advance_obs(bw_array_t *b); static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan) |