瀏覽代碼

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@torproject.org>
David Goulet 5 年之前
父節點
當前提交
cbcc570ff4
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 3 2
      src/or/hs_intropoint.c
  2. 0 1
      src/or/hs_intropoint.h

+ 3 - 2
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;
   }
 

+ 0 - 1
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