summaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-02-20 00:57:37 +0000
committerRoger Dingledine <arma@torproject.org>2008-02-20 00:57:37 +0000
commit7427cf5d5607f4ced7c76b02b55449a0d8f31333 (patch)
treeed03ccbd4f8a823b9bcc91be30e406bf72a2df70 /src/or/relay.c
parent0977c29196aa73711cbac2a275ba1b84687c94a4 (diff)
downloadtor-7427cf5d5607f4ced7c76b02b55449a0d8f31333.tar.gz
tor-7427cf5d5607f4ced7c76b02b55449a0d8f31333.zip
don't throw around an int for relay_command if we're going to
squeeze it into a uint8_t later. also reported by veracode. svn:r13607
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index dd999e9eb0..0dc79e4488 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -466,7 +466,7 @@ relay_header_unpack(relay_header_t *dest, const char *src)
*/
int
relay_send_command_from_edge(uint16_t stream_id, circuit_t *circ,
- int relay_command, const char *payload,
+ uint8_t relay_command, const char *payload,
size_t payload_len, crypt_path_t *cpath_layer)
{
cell_t cell;
@@ -526,7 +526,7 @@ relay_send_command_from_edge(uint16_t stream_id, circuit_t *circ,
*/
int
connection_edge_send_command(edge_connection_t *fromconn,
- int relay_command, const char *payload,
+ uint8_t relay_command, const char *payload,
size_t payload_len)
{
/* XXXX NM Split this function into a separate versions per circuit type? */
@@ -1486,7 +1486,7 @@ circuit_consider_sending_sendme(circuit_t *circ, crypt_path_t *layer_hint)
if (relay_send_command_from_edge(0, circ, RELAY_COMMAND_SENDME,
NULL, 0, layer_hint) < 0) {
log_warn(LD_CIRC,
- "connection_edge_send_command failed. Circuit's closed.");
+ "relay_send_command_from_edge failed. Circuit's closed.");
return; /* the circuit's closed, don't continue */
}
}