commit 82488121882040f6831be554a21629c1428f8031 Author: George Kadianakis desnacked@riseup.net Date: Fri Aug 2 12:35:38 2019 +0300

Rename handle_relay_command to handle_relay_cell_command .

As per David's review. --- src/core/or/relay.c | 4 ++-- src/core/or/relay.h | 2 +- src/test/test_circuitpadding.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/or/relay.c b/src/core/or/relay.c index ac3f2a8bb..98d5b416f 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -1585,7 +1585,7 @@ process_sendme_cell(const relay_header_t *rh, const cell_t *cell, * parent function. */ STATIC int -handle_relay_command(cell_t *cell, circuit_t *circ, +handle_relay_cell_command(cell_t *cell, circuit_t *circ, edge_connection_t *conn, crypt_path_t *layer_hint, relay_header_t *rh, int optimistic_data) { @@ -2033,7 +2033,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, } }

- return handle_relay_command(cell, circ, conn, layer_hint, + return handle_relay_cell_command(cell, circ, conn, layer_hint, &rh, optimistic_data); }

diff --git a/src/core/or/relay.h b/src/core/or/relay.h index d9e0d533f..99f755301 100644 --- a/src/core/or/relay.h +++ b/src/core/or/relay.h @@ -100,7 +100,7 @@ uint8_t packed_cell_get_command(const packed_cell_t *cell, int wide_circ_ids);

#ifdef RELAY_PRIVATE STATIC int -handle_relay_command(cell_t *cell, circuit_t *circ, +handle_relay_cell_command(cell_t *cell, circuit_t *circ, edge_connection_t *conn, crypt_path_t *layer_hint, relay_header_t *rh, int optimistic_data);

diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 8575e6ced..915f08661 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -3169,7 +3169,7 @@ test_circuitpadding_ignore_non_padding_cells(void *arg) rh.command = RELAY_COMMAND_BEGIN;

setup_full_capture_of_logs(LOG_INFO); - retval = handle_relay_command(NULL, client_side, NULL, NULL, &rh, 0); + retval = handle_relay_cell_command(NULL, client_side, NULL, NULL, &rh, 0); tt_int_op(retval, OP_EQ, 0); expect_log_msg_containing("Ignored cell");