[or-cvs] start sending "truncated" cells back rather than destroy ce...

[Roger Dingledine]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	command.c 
Log Message:
start sending 'truncated' cells back rather than destroy cells,
if the circuit closes in front of you.


Index: command.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/command.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- command.c	1 Apr 2005 20:15:55 -0000	1.82
+++ command.c	3 Apr 2005 05:25:26 -0000	1.83
@@ -309,14 +309,13 @@
     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);
   }
 }