nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY

Browse Source 
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>
This commit is contained in:
David Goulet 2019-05-09 12:45:17 -04:00
parent cbce8dedd3
commit cbcc570ff4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/hs_intropoint.c
View File

@ -483,8 +483,9 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
RELAY_COMMAND_INTRODUCE2, RELAY_COMMAND_INTRODUCE2,
(char *) request, request_len, NULL)) { (char *) request, request_len, NULL)) {
log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service."); log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service.");
/* Inform the client that we can't relay the cell. */ /* Inform the client that we can't relay the cell. Use the unknown ID
status = HS_INTRO_ACK_STATUS_CANT_RELAY; * status code since it means that we do not know the service. */
status = HS_INTRO_ACK_STATUS_UNKNOWN_ID;
goto send_ack; goto send_ack;
} }

1
src/or/hs_intropoint.h
View File

@ -24,7 +24,6 @@ typedef enum {
HS_INTRO_ACK_STATUS_SUCCESS = 0x0000, HS_INTRO_ACK_STATUS_SUCCESS = 0x0000,
HS_INTRO_ACK_STATUS_UNKNOWN_ID = 0x0001, HS_INTRO_ACK_STATUS_UNKNOWN_ID = 0x0001,
HS_INTRO_ACK_STATUS_BAD_FORMAT = 0x0002, HS_INTRO_ACK_STATUS_BAD_FORMAT = 0x0002,
HS_INTRO_ACK_STATUS_CANT_RELAY = 0x0003,
} hs_intro_ack_status_t; } hs_intro_ack_status_t;
/* Object containing introduction point common data between the service and /* Object containing introduction point common data between the service and