diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-19 11:58:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-19 11:58:17 -0500 |
| commit | 7b6e81f8e65668e948153a4e089135d0befe3713 (patch) | |
| tree | 482bb3ac8edc4475e121b3844eb893acf28a660d | |
| parent | 11d0016ca12c18b46e34b615672d46e5d4b95481 (diff) | |
| parent | e85f46b7be0e658f3d5cd76dff3f1a98b426f22e (diff) | |
| download | tor-7b6e81f8e65668e948153a4e089135d0befe3713.tar.gz tor-7b6e81f8e65668e948153a4e089135d0befe3713.zip | |
Merge branch 'extract_selftest'
| -rw-r--r-- | changes/ticket33370 | 3 | ||||
| -rw-r--r-- | src/feature/relay/include.am | 4 | ||||
| -rw-r--r-- | src/feature/relay/selftest.h | 29 |
3 files changed, 34 insertions, 2 deletions
diff --git a/changes/ticket33370 b/changes/ticket33370 new file mode 100644 index 0000000000..41e03357f0 --- /dev/null +++ b/changes/ticket33370 @@ -0,0 +1,3 @@ + o Minor features (client-only compilation): + - Disable more of our self-testing code when support for relay mode is + disabled. Closes ticket 33370. diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index a4c025ae12..2f730a6857 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -5,8 +5,7 @@ LIBTOR_APP_A_SOURCES += \ src/feature/relay/ext_orport.c \ src/feature/relay/onion_queue.c \ src/feature/relay/router.c \ - src/feature/relay/routerkeys.c \ - src/feature/relay/selftest.c + src/feature/relay/routerkeys.c # The Relay module. @@ -16,6 +15,7 @@ MODULE_RELAY_SOURCES = \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \ src/feature/relay/relay_sys.c \ + src/feature/relay/selftest.c \ src/feature/relay/transport_config.c # ADD_C_FILE: INSERT HEADERS HERE. diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h index 94f305f203..c7987cf4a8 100644 --- a/src/feature/relay/selftest.h +++ b/src/feature/relay/selftest.h @@ -12,6 +12,7 @@ #ifndef TOR_SELFTEST_H #define TOR_SELFTEST_H +#ifdef HAVE_MODULE_RELAY struct or_options_t; int check_whether_orport_reachable(const struct or_options_t *options); int check_whether_dirport_reachable(const struct or_options_t *options); @@ -20,5 +21,33 @@ void router_do_reachability_checks(int test_or, int test_dir); void router_orport_found_reachable(void); void router_dirport_found_reachable(void); void router_perform_bandwidth_test(int num_circs, time_t now); +#else /* !defined(HAVE_MODULE_RELAY) */ + +#define check_whether_orport_reachable(opts) \ + ((void)(opts), 0) +#define check_whether_dirport_reachable(opts) \ + ((void)(opts), 0) + +#define router_orport_found_reachable() \ + STMT_NIL +#define router_dirport_found_reachable() \ + STMT_NIL + +static inline void +router_do_reachability_checks(int test_or, int test_dir) +{ + (void)test_or; + (void)test_dir; + tor_assert_nonfatal_unreached(); +} +static inline void +router_perform_bandwidth_test(int num_circs, time_t now) +{ + (void)num_circs; + (void)now; + tor_assert_nonfatal_unreached(); +} + +#endif /* defined(HAVE_MODULE_RELAY) */ #endif /* !defined(TOR_SELFTEST_H) */ |