commit ecf88b16b8672c8b734d13d84910e97357c470a8 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 6 00:28:01 2012 -0500

Enable handling of create2/extend2/created2/extended2 --- src/or/command.c | 2 ++ src/or/relay.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/or/command.c b/src/or/command.c index 773d19c..7d1f53a 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -133,11 +133,13 @@ command_process_cell(channel_t *chan, cell_t *cell) switch (cell->command) { case CELL_CREATE: case CELL_CREATE_FAST: + case CELL_CREATE2: ++stats_n_create_cells_processed; PROCESS_CELL(create, cell, chan); break; case CELL_CREATED: case CELL_CREATED_FAST: + case CELL_CREATED2: ++stats_n_created_cells_processed; PROCESS_CELL(created, cell, chan); break; diff --git a/src/or/relay.c b/src/or/relay.c index d0c8c22..5d87b27 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1256,7 +1256,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection_mark_and_flush(TO_CONN(conn)); } return 0; - case RELAY_COMMAND_EXTEND: { + case RELAY_COMMAND_EXTEND: + case RELAY_COMMAND_EXTEND2: { static uint64_t total_n_extend=0, total_nonearly=0; total_n_extend++; if (rh.stream_id) { @@ -1291,6 +1292,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, return circuit_extend(cell, circ); } case RELAY_COMMAND_EXTENDED: + case RELAY_COMMAND_EXTENDED2: if (!layer_hint) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "'extended' unsupported at non-origin. Dropping.");