relay: Disable relay config when the module is disabled

This commit:
* disables the ORPort, DirPort, DirCache, and BridgeRelay options,
* sets ClientOnly 1,
* disables relay_config.c and relay/transport_config.c,
* disables test_rebind.sh, and
* modifies the expected results for test_parseconf.sh,
when the relay module is disabled.

Part of 32213.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/feature/relay/transport_config.h b/src/feature/relay/transport_config.h
index fe3747f665..c23eee03c3 100644
--- a/src/feature/relay/transport_config.h
+++ b/src/feature/relay/transport_config.h
@@ -12,6 +12,8 @@
 #ifndef TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H
 #define TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H
 
+#ifdef HAVE_MODULE_RELAY
+
 #include "lib/testsupport/testsupport.h"
 
 typedef struct or_options_t or_options_t;
@@ -34,4 +36,20 @@ STATIC smartlist_t *get_options_from_transport_options_line(
 
 #endif
 
+#else
+
+#define get_transport_bindaddr_from_config(transport) \
+  (((void)(transport)),NULL)
+
+/* 31851: called from client/transports.c, but only from server code */
+#define get_options_for_server_transport(transport) \
+  (((void)(transport)),NULL)
+
+#define options_validate_server_transport(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_act_server_transport(old_options) \
+  (((void)(old_options)),0)
+
+#endif
+
 #endif /* !defined(TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H) */