1 files changed, 56 insertions, 6 deletions
diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h
index a80ec8936e..e09c0e7898 100644
--- a/src/feature/relay/selftest.h
+++ b/src/feature/relay/selftest.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2019, The Tor Project, Inc. */
+ * Copyright (c) 2007-2020, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
@@ -12,13 +12,63 @@
 #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);
+#define router_all_orports_seem_reachable(opts) \
+  router_orport_seems_reachable((opts),0)
+int router_orport_seems_reachable(
+                                         const struct or_options_t *options,
+                                         int family);
+int router_dirport_seems_reachable(
+                                         const struct or_options_t *options);
 
 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);
 
-#endif
+void router_orport_found_reachable(int family);
+void router_dirport_found_reachable(void);
+
+void router_reset_reachability(void);
+
+#else /* !defined(HAVE_MODULE_RELAY) */
+
+#define router_all_orports_seem_reachable(opts)     \
+  ((void)(opts), 0)
+#define router_orport_seems_reachable(opts, fam)  \
+  ((void)(opts), (void)(fam), 0)
+#define router_dirport_seems_reachable(opts) \
+  ((void)(opts), 0)
+
+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();
+}
+static inline int
+inform_testing_reachability(void)
+{
+  tor_assert_nonfatal_unreached();
+  return 0;
+}
+
+#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(TOR_SELFTEST_H) */