tor

commit 39a72e1927ba10386760072566702c35ffdda62a
parent 32b4307a762c50626f0e86c333d252c749430703
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon,  3 Mar 2025 13:19:11 +0000

Merge branch 'settings_distribution' into 'main'

relay: add settings distribution setting and remove moat

See merge request tpo/core/tor!860
Diffstat:
M
src/feature/relay/relay_config.c
 | 
4
++--
M
src/test/test_config.c
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c
@@ -693,7 +693,7 @@ compute_publishserverdescriptor(or_options_t *options)
  * - "any"
  * - "https"
  * - "email"
- * - "moat"
+ * - "settings"
  *
  * If the option string is unrecognised, a warning will be logged and 0 is
  * returned.  If the option string contains an invalid character, -1 is
@@ -706,7 +706,7 @@ check_bridge_distribution_setting(const char *bd)
     return 0;
 
   const char *RECOGNIZED[] = {
-    "none", "any", "https", "email", "moat"
+    "none", "any", "https", "email", "settings"
   };
   unsigned i;
   for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
diff --git a/src/test/test_config.c b/src/test/test_config.c
@@ -6321,14 +6321,14 @@ test_config_check_bridge_distribution_setting_valid(void *arg)
   tt_int_op(check_bridge_distribution_setting("any"), OP_EQ, 0);
   tt_int_op(check_bridge_distribution_setting("https"), OP_EQ, 0);
   tt_int_op(check_bridge_distribution_setting("email"), OP_EQ, 0);
-  tt_int_op(check_bridge_distribution_setting("moat"), OP_EQ, 0);
+  tt_int_op(check_bridge_distribution_setting("settings"), OP_EQ, 0);
 
   // Check all the possible values we support right now with weird casing.
   tt_int_op(check_bridge_distribution_setting("NoNe"), OP_EQ, 0);
   tt_int_op(check_bridge_distribution_setting("anY"), OP_EQ, 0);
   tt_int_op(check_bridge_distribution_setting("hTTps"), OP_EQ, 0);
   tt_int_op(check_bridge_distribution_setting("emAIl"), OP_EQ, 0);
-  tt_int_op(check_bridge_distribution_setting("moAt"), OP_EQ, 0);
+  tt_int_op(check_bridge_distribution_setting("setTIngS"), OP_EQ, 0);
 
   // Invalid values.
   tt_int_op(check_bridge_distribution_setting("x\rx"), OP_EQ, -1);