aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-03 05:25:26 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-03 05:25:26 +0000
commit096879687ae2d3444d8b230a66a9182d68df2567 (patch)
tree67e9bce86acb58a8aa364710bb6056c32a1f9472
parent0dc02328afa5e6ec6c1799bd013476ae02db568f (diff)
downloadtor-096879687ae2d3444d8b230a66a9182d68df2567.tar.gz
tor-096879687ae2d3444d8b230a66a9182d68df2567.zip
start sending 'truncated' cells back rather than destroy cells,
if the circuit closes in front of you. svn:r3993
-rw-r--r--src/or/command.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/command.c b/src/or/command.c
index a8caed528c..98bbae252c 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -309,14 +309,13 @@ static void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
circuit_mark_for_close(circ);
} else { /* the destroy came from ahead */
circ->n_conn = NULL;
-#if 0
- if (!CIRCUIT_IS_ORIGIN(circ)) {
+ if (CIRCUIT_IS_ORIGIN(circ)) {
+ circuit_mark_for_close(circ);
+ } else {
log_fn(LOG_DEBUG, "Delivering 'truncated' back.");
connection_edge_send_command(NULL, circ, RELAY_COMMAND_TRUNCATED,
NULL, 0, NULL);
}
-#endif
- circuit_mark_for_close(circ);
}
}