summaryrefslogtreecommitdiff
path: root/src/or/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/command.c')
-rw-r--r--src/or/command.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/or/command.c b/src/or/command.c
index 0a6ec559bb..8f0769c424 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -200,15 +200,20 @@ static void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
onion_pending_remove(circ);
}
- if(cell->circ_id == circ->p_circ_id || CIRCUIT_IS_ORIGIN(circ)) {
- /* either the destroy came from behind, or we're the AP */
+ if(cell->circ_id == circ->p_circ_id) {
+ /* the destroy came from behind */
circ->p_conn = NULL;
circuit_mark_for_close(circ);
} else { /* the destroy came from ahead */
circ->n_conn = NULL;
- log_fn(LOG_DEBUG, "Delivering 'truncated' back.");
- connection_edge_send_command(NULL, circ, RELAY_COMMAND_TRUNCATED,
- NULL, 0, NULL);
+#if 0
+ if(!CIRCUIT_IS_ORIGIN(circ)) {
+ 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);
}
}