[or-cvs] r13607: don't throw around an int for relay_command if we're going t (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-02-19 19:57:37 -0500 (Tue, 19 Feb 2008)
New Revision: 13607

Modified:
   tor/trunk/src/or/or.h
   tor/trunk/src/or/relay.c
Log:
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.


Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-02-20 00:46:09 UTC (rev 13606)
+++ tor/trunk/src/or/or.h	2008-02-20 00:57:37 UTC (rev 13607)
@@ -3511,10 +3511,10 @@
 void relay_header_pack(char *dest, const relay_header_t *src);
 void 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);
 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);
 int connection_edge_package_raw_inbuf(edge_connection_t *conn,
                                       int package_partial);

Modified: tor/trunk/src/or/relay.c
===================================================================
--- tor/trunk/src/or/relay.c	2008-02-20 00:46:09 UTC (rev 13606)
+++ tor/trunk/src/or/relay.c	2008-02-20 00:57:37 UTC (rev 13607)
@@ -466,7 +466,7 @@
  */
 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 @@
  */
 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 @@
     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 */
     }
   }