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

relay: Re-order selftest header

Browse Source 
The selftest header declares functions, and stubs for when the relay
module is disabled. Put the functions and stubs in the same order.

Part of 33633.
This commit is contained in:
teor 2020-03-17 16:10:49 +10:00
parent 4bb06cae26
commit 07280c567e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/feature/relay/selftest.h
View File

@ -13,14 +13,17 @@
#define TOR_SELFTEST_H #define TOR_SELFTEST_H
#ifdef HAVE_MODULE_RELAY #ifdef HAVE_MODULE_RELAY
struct or_options_t; struct or_options_t;
int check_whether_orport_reachable(const struct or_options_t *options); int check_whether_orport_reachable(const struct or_options_t *options);
int check_whether_dirport_reachable(const struct or_options_t *options); int check_whether_dirport_reachable(const struct or_options_t *options);
void router_do_reachability_checks(int test_or, int test_dir); void router_do_reachability_checks(int test_or, int test_dir);
void router_perform_bandwidth_test(int num_circs, time_t now);
void router_orport_found_reachable(void); void router_orport_found_reachable(void);
void router_dirport_found_reachable(void); void router_dirport_found_reachable(void);
void router_perform_bandwidth_test(int num_circs, time_t now);
void router_reset_reachability(void); void router_reset_reachability(void);
#else /* !defined(HAVE_MODULE_RELAY) */ #else /* !defined(HAVE_MODULE_RELAY) */
@ -30,13 +33,6 @@ void router_reset_reachability(void);
#define check_whether_dirport_reachable(opts) \ #define check_whether_dirport_reachable(opts) \
((void)(opts), 0) ((void)(opts), 0)
#define router_orport_found_reachable() \
STMT_NIL
#define router_dirport_found_reachable() \
STMT_NIL
#define router_reset_reachability() \
STMT_NIL
static inline void static inline void
router_do_reachability_checks(int test_or, int test_dir) router_do_reachability_checks(int test_or, int test_dir)
{ {
@ -52,6 +48,14 @@ router_perform_bandwidth_test(int num_circs, time_t now)
tor_assert_nonfatal_unreached(); tor_assert_nonfatal_unreached();
} }
#define router_orport_found_reachable() \
STMT_NIL
#define router_dirport_found_reachable() \
STMT_NIL
#define router_reset_reachability() \
STMT_NIL
#endif /* defined(HAVE_MODULE_RELAY) */ #endif /* defined(HAVE_MODULE_RELAY) */
#endif /* !defined(TOR_SELFTEST_H) */ #endif /* !defined(TOR_SELFTEST_H) */