torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: couldn't send two creates, two datas, and the destroy all at once

Browse Source 
(amazing the odd behavior you get to test when you have a flaky modem
connection)


svn:r148
This commit is contained in:
Roger Dingledine
2002-12-23 06:48:14 +00:00
parent 7a18057357
commit fbf4ca3ff8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/circuit.c
+1
View File
@@ -352,6 +352,7 @@ void circuit_about_to_close_connection(connection_t *conn) {
circuit_remove(circ);
if(circ->n_conn == conn) /* it's closing in front of us */
/* circ->p_conn should always be set */
assert(circ->p_conn);
connection_send_destroy(circ->p_aci, circ->p_conn);
if(circ->p_conn == conn) /* it's closing behind us */
if(circ->n_conn)
src/or/command.c
+7 -3
View File
@@ -300,10 +300,14 @@ void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
onion_pending_remove(circ);
}
circuit_remove(circ);
if(cell->aci == circ->p_aci) /* the destroy came from behind */
connection_send_destroy(circ->n_aci, circ->n_conn);
if(cell->aci == circ->n_aci) /* the destroy came from ahead */
if(cell->aci == circ->p_aci) { /* the destroy came from behind */
if(circ->n_conn) /* might not be defined, eg if it was just on the pending queue */
connection_send_destroy(circ->n_aci, circ->n_conn);
}
if(cell->aci == circ->n_aci) { /* the destroy came from ahead */
assert(circ->p_conn);
connection_send_destroy(circ->p_aci, circ->p_conn);
}
circuit_free(circ);
}