1 files changed, 104 insertions, 5 deletions

diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h
index 13ab0fe7f2..5f08fc3e0f 100644
--- a/src/feature/relay/relay_config.h
+++ b/src/feature/relay/relay_config.h
@@ -12,12 +12,19 @@
 #ifndef TOR_FEATURE_RELAY_RELAY_CONFIG_H
 #define TOR_FEATURE_RELAY_RELAY_CONFIG_H
 
+typedef struct or_options_t or_options_t;
+
+#ifdef HAVE_MODULE_RELAY
+
 #include "lib/cc/torint.h"
 #include "lib/testsupport/testsupport.h"
 
-typedef struct or_options_t or_options_t;
 typedef struct smartlist_t smartlist_t;
 
+int options_validate_relay_mode(const or_options_t *old_options,
+                                or_options_t *options,
+                                char **msg);
+
 MOCK_DECL(const char*, get_dirportfrontpage, (void));
 void relay_config_free_all(void);
 
@@ -58,10 +65,6 @@ int options_validate_relay_accounting(const or_options_t *old_options,
                                       or_options_t *options,
                                       char **msg);
 
-int options_validate_relay_mode(const or_options_t *old_options,
-                                or_options_t *options,
-                                char **msg);
-
 int options_validate_relay_testing(const or_options_t *old_options,
                                    or_options_t *options,
                                    char **msg);
@@ -70,6 +73,7 @@ int options_act_relay(const or_options_t *old_options);
 int options_act_relay_accounting(const or_options_t *old_options);
 int options_act_relay_bandwidth(const or_options_t *old_options);
 int options_act_bridge_stats(const or_options_t *old_options);
+
 int options_act_relay_stats(const or_options_t *old_options,
                             bool *print_notice_out);
 void options_act_relay_stats_msg(void);
@@ -86,4 +90,99 @@ STATIC int have_enough_mem_for_dircache(const or_options_t *options,
 
 #endif
 
+#else
+
+#include "lib/cc/compat_compiler.h"
+
+/** When tor is compiled with the relay module disabled, it can't be
+ * configured as a relay or bridge.
+ *
+ * Always sets ClientOnly to 1.
+ *
+ * Returns -1 and sets msg to a newly allocated string, if ORPort, DirPort,
+ * DirCache, or BridgeRelay are set in options. Otherwise returns 0. */
+static inline int
+options_validate_relay_mode(const or_options_t *old_options,
+                            or_options_t *options,
+                            char **msg)
+{
+  (void)old_options;
+
+  /* Only check the primary options for now, #29211 will disable more
+   * options. These ORPort and DirPort checks are too strict, and will
+   * reject valid configs that disable ports, like "ORPort 0". */
+  if (options->DirCache ||
+      options->BridgeRelay ||
+      options->ORPort_lines ||
+      options->DirPort_lines) {
+    /* REJECT() this configuration */
+    *msg = tor_strdup("This tor was built with relay mode disabled. "
+                      "It can not be configured with an ORPort, a DirPort, "
+                      "DirCache 1, or BridgeRelay 1.");
+    return -1;
+  }
+
+  /* 31851 / 29211: Set this option the correct way */
+  options->ClientOnly = 1;
+
+  return 0;
+}
+
+#define get_dirportfrontpage() \
+  (NULL)
+#define relay_config_free_all() \
+  STMT_BEGIN STMT_END
+
+#define get_effective_bwrate(options) \
+  (((void)(options)),0)
+#define get_effective_bwburst(options) \
+  (((void)(options)),0)
+
+#define warn_nonlocal_ext_orports(ports, portname) \
+  (((void)(ports)),((void)(portname)))
+
+#define parse_ports_relay(options, msg, ports_out, have_low_ports_out) \
+  (((void)(options)),((void)(msg)),((void)(ports_out)), \
+   ((void)(have_low_ports_out)),0)
+#define update_port_set_relay(options, ports) \
+  (((void)(options)),((void)(ports)))
+
+#define options_validate_relay_os(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_validate_relay_info(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_validate_publish_server(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_validate_relay_padding(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_validate_relay_bandwidth(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_validate_relay_accounting(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+#define options_validate_relay_testing(old_options, options, msg) \
+  (((void)(old_options)),((void)(options)),((void)(msg)),0)
+
+#define options_act_relay(old_options) \
+  (((void)(old_options)),0)
+#define options_act_relay_accounting(old_options) \
+  (((void)(old_options)),0)
+#define options_act_relay_bandwidth(old_options) \
+  (((void)(old_options)),0)
+#define options_act_bridge_stats(old_options) \
+  (((void)(old_options)),0)
+
+#define options_act_relay_stats(old_options, print_notice_out) \
+  (((void)(old_options)),((void)(print_notice_out)),0)
+#define options_act_relay_stats_msg() \
+  STMT_BEGIN STMT_END
+
+#define options_act_relay_desc(old_options) \
+  (((void)(old_options)),0)
+#define options_act_relay_dos(old_options) \
+  (((void)(old_options)),0)
+#define options_act_relay_dir(old_options) \
+  (((void)(old_options)),0)
+
+#endif
+
 #endif /* !defined(TOR_FEATURE_RELAY_RELAY_CONFIG_H) */