[tor-commits] [tor/release-0.3.5] hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY

[teor at torproject.org]

commit cbcc570ff4a8e03fc08bfd020d6b4c7365d4d137
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 9 12:45:17 2019 -0400

    hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY
    
    The INTRODUCE1 trunnel definition file doesn't support that value so it can
    not be used else it leads to an assert on the intro point side if ever tried.
    
    Fortunately, it was impossible to reach that code path.
    
    Part of #30454
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/hs_intropoint.c | 5 +++--
 src/or/hs_intropoint.h | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index ee79109ca..e0ab27bd3 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -483,8 +483,9 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
                                    RELAY_COMMAND_INTRODUCE2,
                                    (char *) request, request_len, NULL)) {
     log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service.");
-    /* Inform the client that we can't relay the cell. */
-    status = HS_INTRO_ACK_STATUS_CANT_RELAY;
+    /* Inform the client that we can't relay the cell. Use the unknown ID
+     * status code since it means that we do not know the service. */
+    status = HS_INTRO_ACK_STATUS_UNKNOWN_ID;
     goto send_ack;
   }
 
diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h
index 749d1530e..014f9339a 100644
--- a/src/or/hs_intropoint.h
+++ b/src/or/hs_intropoint.h
@@ -24,7 +24,6 @@ typedef enum {
   HS_INTRO_ACK_STATUS_SUCCESS    = 0x0000,
   HS_INTRO_ACK_STATUS_UNKNOWN_ID = 0x0001,
   HS_INTRO_ACK_STATUS_BAD_FORMAT = 0x0002,
-  HS_INTRO_ACK_STATUS_CANT_RELAY = 0x0003,
 } hs_intro_ack_status_t;
 
 /* Object containing introduction point common data between the service and