summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsis Lovecruft <isis@torproject.org>2017-10-23 19:37:52 +0000
committerNick Mathewson <nickm@torproject.org>2017-10-24 19:26:24 -0400
commitb0e10f23ba2b03f275ef4acf2183a02042e6cded (patch)
tree9502c7f0e8f5665279ab37f3918b2b7e6f3bb3e0
parent613b18f0afd865b0fc5daf8d17da241396100dcd (diff)
downloadtor-b0e10f23ba2b03f275ef4acf2183a02042e6cded.tar.gz
tor-b0e10f23ba2b03f275ef4acf2183a02042e6cded.zip
doc: Improve documentation for check_bridge_distribution_setting().
-rw-r--r--src/or/config.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 7f45bb2cba..4d08a07957 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6350,8 +6350,26 @@ warn_client_dns_cache(const char *option, int disabling)
"to your destination.");
}
-/** Warn if <b>bd</b> is an unrecognized bridge distribution setting;
- * return -1 if it is invalid. */
+/**
+ * Validate the configured bridge distribution method from a BridgeDistribution
+ * config line.
+ *
+ * The input <b>bd</b>, is a string taken from the BridgeDistribution config
+ * line (if present). If the option wasn't set, return 0 immediately. The
+ * BridgeDistribution option is then validated. Currently valid, recognised
+ * options are:
+ *
+ * - "none"
+ * - "any"
+ * - "https"
+ * - "email"
+ * - "moat"
+ * - "hyphae"
+ *
+ * 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
+ * returned.
+ **/
static int
check_bridge_distribution_setting(const char *bd)
{