relay: Disable relay_periodic when the relay module is disabled

Closes ticket 32244.

diff --git a/changes/ticket32244 b/changes/ticket32244
new file mode 100644 (file)
index 0000000..b3690b7
--- /dev/null
+++ b/changes/ticket32244
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring:
+    - Disable relay_periodic when the relay module is disabled.
+      Closes ticket 32244.

diff --git a/src/core/include.am b/src/core/include.am
index 193b10a1cc7755a4763f5b55e15498d5c9478434..5cafc412108d3dec418b09c77acfe0888a4eacf4 100644 (file)
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -143,7 +143,6 @@ LIBTOR_APP_A_SOURCES =                              \
        src/feature/relay/dns.c                 \
        src/feature/relay/ext_orport.c          \
        src/feature/relay/onion_queue.c         \
-       src/feature/relay/relay_periodic.c      \
        src/feature/relay/relay_sys.c           \
        src/feature/relay/router.c              \
        src/feature/relay/routerkeys.c          \
@@ -174,6 +173,7 @@ LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
 MODULE_RELAY_SOURCES =                                                 \
        src/feature/relay/routermode.c                          \
        src/feature/relay/relay_config.c                        \
+       src/feature/relay/relay_periodic.c                      \
        src/feature/relay/transport_config.c
 
 # The Directory Authority module.

diff --git a/src/feature/relay/relay_periodic.h b/src/feature/relay/relay_periodic.h
index b6ea83c749f0900579a171a4f7e0c38f4b20bbb1..8da5b536a767f9b1dd2f30c13aa335503b261db7 100644 (file)
--- a/src/feature/relay/relay_periodic.h
+++ b/src/feature/relay/relay_periodic.h
@@ -12,7 +12,20 @@
 #ifndef TOR_FEATURE_RELAY_RELAY_PERIODIC_H
 #define TOR_FEATURE_RELAY_RELAY_PERIODIC_H
 
+#ifdef HAVE_MODULE_RELAY
+
 void relay_register_periodic_events(void);
 void reschedule_descriptor_update_check(void);
 
+#else
+
+#include "lib/cc/compat_compiler.h"
+
+#define relay_register_periodic_events() \
+  STMT_NIL
+#define reschedule_descriptor_update_check() \
+  STMT_NIL
+
+#endif
+
 #endif /* !defined(TOR_FEATURE_RELAY_RELAY_PERIODIC_H) */