diff options
author | David Goulet <dgoulet@torproject.org> | 2017-11-10 15:31:31 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2017-11-10 15:31:31 -0500 |
commit | 42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d (patch) | |
tree | 7f2091ccd516b511b3eee0cf4bf9da94c612f366 | |
parent | aa1d90b40c5f6e65b7b95cfb7e192e27e6530c52 (diff) | |
download | tor-42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d.tar.gz tor-42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d.zip |
control: Fix wrong Action on failure to upload an HS descriptor
On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the
Action but it should have reported "FAILED" according to the spec.
Fixes #24230
Signed-off-by: David Goulet <dgoulet@torproject.org>
-rw-r--r-- | changes/bug24230 | 4 | ||||
-rw-r--r-- | src/or/control.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug24230 b/changes/bug24230 new file mode 100644 index 0000000000..b08c4cde24 --- /dev/null +++ b/changes/bug24230 @@ -0,0 +1,4 @@ + o Minor bugfixes (control port, hidden service): + - Control port was reporting the action "UPLOAD_FAILED" instead of + "FAILED" for the HS_DESC event when a service was not able to upload a + descriptor. Fixes bug 24230; bugfix on 0.2.7.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index 8173cb1e56..202366aaec 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7284,7 +7284,7 @@ control_event_hs_descriptor_upload_failed(const char *id_digest, id_digest); return; } - control_event_hs_descriptor_upload_end("UPLOAD_FAILED", onion_address, + control_event_hs_descriptor_upload_end("FAILED", onion_address, id_digest, reason); } |