Declare relay/dirauth subsystem levels in a header.

This way, we can't get out of sync between the two declarations.

diff --git a/src/feature/dirauth/dirauth_stub.c b/src/feature/dirauth/dirauth_stub.c
index b0b4f987f2b450c331eef3125ac5aa0dab4bef13..d902d56d2ba10c7839b5a4555dc2de1015b88d38 100644 (file)
--- a/src/feature/dirauth/dirauth_stub.c
+++ b/src/feature/dirauth/dirauth_stub.c
@@ -27,7 +27,7 @@ static const config_format_t dirauth_options_stub_fmt = {
 const struct subsys_fns_t sys_dirauth = {
   .name = "dirauth",
   .supported = false,
-  .level = 70,
+  .level = DIRAUTH_SUBSYS_LEVEL,
 
   .options_format = &dirauth_options_stub_fmt
 };

diff --git a/src/feature/dirauth/dirauth_sys.c b/src/feature/dirauth/dirauth_sys.c
index 8a4b1abaab2584b7e9df3cb71ef9fc2ce1c3de60..6ec25681e7e458483971adc5aeb9f5f1807cd9a9 100644 (file)
--- a/src/feature/dirauth/dirauth_sys.c
+++ b/src/feature/dirauth/dirauth_sys.c
@@ -60,7 +60,7 @@ dirauth_set_options(void *arg)
 const struct subsys_fns_t sys_dirauth = {
   .name = "dirauth",
   .supported = true,
-  .level = 70,
+  .level = DIRAUTH_SUBSYS_LEVEL,
   .initialize = subsys_dirauth_initialize,
   .shutdown = subsys_dirauth_shutdown,
 

diff --git a/src/feature/dirauth/dirauth_sys.h b/src/feature/dirauth/dirauth_sys.h
index 4c09ff64f966a85820a91d4d142632bf6d338ded..6f116855dfadfd7dff622de1e416cf0bdcb51a0d 100644 (file)
--- a/src/feature/dirauth/dirauth_sys.h
+++ b/src/feature/dirauth/dirauth_sys.h
@@ -17,4 +17,12 @@ const struct dirauth_options_t *dirauth_get_options(void);
 
 extern const struct subsys_fns_t sys_dirauth;
 
+/**
+ * Subsystem level for the directory-authority system.
+ *
+ * Defined here so that it can be shared between the real and stub
+ * definitions.
+ **/
+#define DIRAUTH_SUBSYS_LEVEL 70
+
 #endif /* !defined(DIRAUTH_SYS_H) */

diff --git a/src/feature/relay/relay_stub.c b/src/feature/relay/relay_stub.c
index a23b9918624eee78cfba6021ff234359bdf10c4f..36daaa7bd76a34877095f3569757eb63f8347edb 100644 (file)
--- a/src/feature/relay/relay_stub.c
+++ b/src/feature/relay/relay_stub.c
@@ -16,5 +16,5 @@
 const struct subsys_fns_t sys_relay = {
   .name = "relay",
   .supported = false,
-  .level = 50,
+  .level = RELAY_SUBSYS_LEVEL,
 };

diff --git a/src/feature/relay/relay_sys.c b/src/feature/relay/relay_sys.c
index 106e88b2a56fa3bbd32c20fd7e5f87be98a42ba5..dfddff27f2534a989af50a9171c1236f15f40713 100644 (file)
--- a/src/feature/relay/relay_sys.c
+++ b/src/feature/relay/relay_sys.c
@@ -42,7 +42,7 @@ subsys_relay_shutdown(void)
 const struct subsys_fns_t sys_relay = {
   .name = "relay",
   .supported = true,
-  .level = 50,
+  .level = RELAY_SUBSYS_LEVEL,
   .initialize = subsys_relay_initialize,
   .shutdown = subsys_relay_shutdown,
 };

diff --git a/src/feature/relay/relay_sys.h b/src/feature/relay/relay_sys.h
index 32e21d90d892b2618f0550c3e4276ebb74f0884e..ba3b5ccf4ee635a0806320b3d564d526780cf1d0 100644 (file)
--- a/src/feature/relay/relay_sys.h
+++ b/src/feature/relay/relay_sys.h
@@ -14,4 +14,12 @@
 
 extern const struct subsys_fns_t sys_relay;
 
+/**
+ * Subsystem level for the relay system.
+ *
+ * Defined here so that it can be shared between the real and stub
+ * definitions.
+ **/
+#define RELAY_SUBSYS_LEVEL 50
+
 #endif /* !defined(TOR_FEATURE_RELAY_RELAY_SYS_H) */