tor

commit 42ce6f78c8a34b7c4bed01d834308f7dde4c8e7d
parent aa1d90b40c5f6e65b7b95cfb7e192e27e6530c52
Author: David Goulet <dgoulet@torproject.org>
Date:   Fri, 10 Nov 2017 15:31:31 -0500

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>

Diffstat:
A
changes/bug24230
 | 
4
++++
M
src/or/control.c
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug24230 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
@@ -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);
 }