diff options
| author | Alexander Færøy <ahf@torproject.org> | 2018-09-20 20:59:42 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2018-09-20 20:59:42 +0200 |
| commit | 8ecaf41003cc5b513cf26c4ae176d5043f5a6a93 (patch) | |
| tree | f92ed331e7dace0f534180df975b8e0d7e50e031 | |
| parent | 3477a73af99eb72f8374928fdc2fab4858485219 (diff) | |
| download | tor-8ecaf41003cc5b513cf26c4ae176d5043f5a6a93.tar.gz tor-8ecaf41003cc5b513cf26c4ae176d5043f5a6a93.zip | |
Support 'none' in torrc for HiddenServiceExportCircuitID.
See: https://bugs.torproject.org/4700
| -rw-r--r-- | doc/tor.1.txt | 3 | ||||
| -rw-r--r-- | src/feature/hs/hs_config.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d260eec10d..df298e1d77 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2838,7 +2838,8 @@ The following options are used to configure a hidden service. [[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** __protocol__:: The onion service will use the given protocol to expose the global circuit identifier of each inbound client circuit via the selected protocol. The only - protocol supported right now \'haproxy\'. This option is only for v3 services. + protocol supported right now \'haproxy\'. This option is only for v3 + services. (Default: none) [[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__:: The maximum number of simultaneous streams (connections) per rendezvous diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 2378a4d3b2..93d7403dfb 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -161,8 +161,11 @@ helper_parse_circuit_id_protocol(const char *key, const char *value, int *ok) if (! strcasecmp(value, "haproxy")) { *ok = 1; ret = HS_CIRCUIT_ID_PROTOCOL_HAPROXY; + } else if (! strcasecmp(value, "none")) { + *ok = 1; + ret = HS_CIRCUIT_ID_PROTOCOL_NONE; } else { - log_warn(LD_CONFIG, "%s must be 'haproxy'.", key); + log_warn(LD_CONFIG, "%s must be 'haproxy' or 'none'.", key); goto err; } |