summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-08-02 12:35:38 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2019-08-05 18:03:23 +0300
commit82488121882040f6831be554a21629c1428f8031 (patch)
tree0c9f2b91254183712879bd7922b79acc12d96f80
parent1e970d17b8e028ec6bd2fa9e0d88dc54209e0523 (diff)
downloadtor-82488121882040f6831be554a21629c1428f8031.tar.gz
tor-82488121882040f6831be554a21629c1428f8031.zip
Rename handle_relay_command to handle_relay_cell_command .
As per David's review.
-rw-r--r--src/core/or/relay.c4
-rw-r--r--src/core/or/relay.h2
-rw-r--r--src/test/test_circuitpadding.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index ac3f2a8bb4..98d5b416f1 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 d9e0d533f5..99f7553013 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 8575e6cedd..915f086615 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");