diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-04-08 09:41:28 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-04-08 09:41:28 +0000 |
| commit | eb9f5a561e73578e8171960d0d3f02bdba9b7b63 (patch) | |
| tree | 38fb452e2d58ce8bbb72818ce314d0d614f166ec /src/or/or.h | |
| parent | 8e686d0c72a42ea79e93b2775333a3fa457a9325 (diff) | |
| download | tor-eb9f5a561e73578e8171960d0d3f02bdba9b7b63.tar tor-eb9f5a561e73578e8171960d0d3f02bdba9b7b63.tar.gz | |
circuit-level sendmes weren't working, because the exit
thought it was an exit.
i overhauled the edge_type mechanism. hopefully this will help.
svn:r1570
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/or.h b/src/or/or.h index ca557c37b..a28885464 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -271,9 +271,9 @@ #define CELL_DIRECTION_IN 1 #define CELL_DIRECTION_OUT 2 -#define EDGE_EXIT CONN_TYPE_EXIT -#define EDGE_AP CONN_TYPE_AP -#define CELL_DIRECTION(x) ((x) == EDGE_EXIT ? CELL_DIRECTION_IN : CELL_DIRECTION_OUT) +//#define EDGE_EXIT CONN_TYPE_EXIT +//#define EDGE_AP CONN_TYPE_AP +//#define CELL_DIRECTION(x) ((x) == EDGE_EXIT ? CELL_DIRECTION_IN : CELL_DIRECTION_OUT) #ifdef TOR_PERF #define CIRCWINDOW_START 10000 @@ -721,9 +721,9 @@ int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, int circuit_package_relay_cell(cell_t *cell, circuit_t *circ, int cell_direction, crypt_path_t *layer_hint); -void circuit_resume_edge_reading(circuit_t *circ, int edge_type, crypt_path_t *layer_hint); -int circuit_consider_stop_edge_reading(circuit_t *circ, int edge_type, crypt_path_t *layer_hint); -void circuit_consider_sending_sendme(circuit_t *circ, int edge_type, crypt_path_t *layer_hint); +void circuit_resume_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); +int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); +void circuit_consider_sending_sendme(circuit_t *circ, crypt_path_t *layer_hint); void circuit_detach_stream(circuit_t *circ, connection_t *conn); void circuit_about_to_close_connection(connection_t *conn); @@ -850,7 +850,7 @@ int connection_edge_send_command(connection_t *fromconn, circuit_t *circ, int relay_command, const char *payload, int payload_len, crypt_path_t *cpath_layer); int connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, - connection_t *conn, int edge_type, + connection_t *conn, crypt_path_t *layer_hint); int connection_edge_finished_flushing(connection_t *conn); |