mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 18:00:33 +01:00
Code Issues Projects Releases Wiki Activity

Support 'none' in torrc for HiddenServiceExportCircuitID.

Browse Source 
See: https://bugs.torproject.org/4700
This commit is contained in:
Alexander Færøy 2018-09-20 20:59:42 +02:00
parent 3477a73af9
commit 8ecaf41003
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/tor.1.txt
View File

@ -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

5
src/feature/hs/hs_config.c
View File

@ -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;
}