Skip to content
Snippets Groups Projects
Verified Commit 0d3894db authored by Cecylia Bocovich's avatar Cecylia Bocovich
Browse files

Add documentation on {C,S}METHOD parsing behaviour

parent 809b636b
No related branches found
No related tags found
No related merge requests found
o Minor bugfix (pluggable transport):
- Do not kill a managed proxy if one of its transport configurations
emits a method error. Instead log a warning and continue processing
method arguments. Closes ticket 7362.
......@@ -903,12 +903,20 @@ handle_proxy_line(const char *line, managed_proxy_t *mp)
if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS)
goto err;
/* Log the error but do not kill the managed proxy.
* A proxy may contain several transports and if one
* of them is misconfigured, we still want to use
* the other transports. A managed proxy with no usable
* transports will log a warning.
* See https://gitlab.torproject.org/tpo/core/tor/-/issues/7362
* */
parse_client_method_error(line);
return;
} else if (!strcmpstart(line, PROTO_SMETHOD_ERROR)) {
if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS)
goto err;
/* Log the error but do not kill the managed proxy */
parse_server_method_error(line);
return;
} else if (!strcmpstart(line, PROTO_CMETHOD)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment