Rename handle_relay_command to handle_relay_cell_command .

As per David's review.

diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index ac3f2a8bb4ef6d8851da7fb3f0d49b9d07c3b38b..98d5b416f135e0d29fc367a9666dbcec56aad24c 100644 (file)
--- 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 d9e0d533f535c95319525f70b690f93acf6c0e30..99f7553013301f924f755e464b41e4107f7f6aa9 100644 (file)
--- 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 8575e6cedd2e68ba0739a1c3e65f36c8025231c4..915f086615324980893eeb4a36c7e7d10235c882 100644 (file)
--- 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");