Change CELL_DIRECTION_* to an enum.

svn:r17646

2 files changed, 16 insertions, 12 deletions

diff --git a/src/or/or.h b/src/or/or.h
index 96d9ca0949..c1698374f5 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -745,8 +745,11 @@ typedef struct rend_data_t {
  * future are dropped immediately. */
 #define REND_REPLAY_TIME_INTERVAL (60 * 60)
 
-#define CELL_DIRECTION_IN 1
-#define CELL_DIRECTION_OUT 2
+/** Used to indicate which way a cell is going on a circuit. */
+typedef enum {
+  CELL_DIRECTION_IN=1, /**< The cell is moving towards the origin. */
+  CELL_DIRECTION_OUT=2, /**< The cell is moving away from the origin. */
+} cell_direction_t;
 
 /** Initial value for both sides of a circuit transmission window when the
  * circuit is initialized.  Measured in cells. */
@@ -3823,7 +3826,7 @@ extern uint64_t stats_n_relay_cells_relayed;
 extern uint64_t stats_n_relay_cells_delivered;
 
 int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
-                               int cell_direction);
+                               cell_direction_t cell_direction);
 
 void relay_header_pack(char *dest, const relay_header_t *src);
 void relay_header_unpack(relay_header_t *dest, const char *src);
@@ -3852,7 +3855,7 @@ void cell_queue_append(cell_queue_t *queue, packed_cell_t *cell);
 void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell);
 
 void append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn,
-                                  cell_t *cell, int direction);
+                                  cell_t *cell, cell_direction_t direction);
 void connection_or_unlink_all_active_circs(or_connection_t *conn);
 int connection_or_flush_from_first_active_circuit(or_connection_t *conn,
                                                   int max, time_t now);
diff --git a/src/or/relay.c b/src/or/relay.c
index 83dfea5c0a..4ebfc12cbb 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -16,10 +16,10 @@ const char relay_c_id[] =
 #include "or.h"
 #include "mempool.h"
 
-static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
+static int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction,
                 crypt_path_t **layer_hint, char *recognized);
 static edge_connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell,
-                                            int cell_direction,
+                                            cell_direction_t cell_direction,
                                             crypt_path_t *layer_hint);
 
 static int
@@ -141,7 +141,8 @@ relay_crypt_one_payload(crypto_cipher_env_t *cipher, char *in,
  * Return -<b>reason</b> on failure.
  */
 int
-circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, int cell_direction)
+circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
+                           cell_direction_t cell_direction)
 {
   or_connection_t *or_conn=NULL;
   crypt_path_t *layer_hint=NULL;
@@ -252,7 +253,7 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, int cell_direction)
  * else return 0.
  */
 static int
-relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
+relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction,
             crypt_path_t **layer_hint, char *recognized)
 {
   relay_header_t rh;
@@ -326,7 +327,7 @@ relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
  */
 static int
 circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
-                           int cell_direction,
+                           cell_direction_t cell_direction,
                            crypt_path_t *layer_hint)
 {
   or_connection_t *conn; /* where to send the cell */
@@ -379,7 +380,7 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
  * attached to circ, return that conn, else return NULL.
  */
 static edge_connection_t *
-relay_lookup_conn(circuit_t *circ, cell_t *cell, int cell_direction,
+relay_lookup_conn(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction,
                   crypt_path_t *layer_hint)
 {
   edge_connection_t *tmpconn;
@@ -472,7 +473,7 @@ relay_send_command_from_edge(uint16_t stream_id, circuit_t *circ,
 {
   cell_t cell;
   relay_header_t rh;
-  int cell_direction;
+  cell_direction_t cell_direction;
   /* XXXX NM Split this function into a separate versions per circuit type? */
 
   tor_assert(circ);
@@ -1801,7 +1802,7 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max,
  * transmitting in <b>direction</b>. */
 void
 append_cell_to_circuit_queue(circuit_t *circ, or_connection_t *orconn,
-                             cell_t *cell, int direction)
+                             cell_t *cell, cell_direction_t direction)
 {
   cell_queue_t *queue;
   int streams_blocked;