nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also raise the check for 0 circuit ID in created cell.

Browse Source 
And add a comment about why conditions that would cause us to drop a
cell should get checked before actions that would cause us to send a
destroy cell.

Spotted by 'cypherpunks'.

And note that these issues have been present since 0.0.8pre1 (commit
0da256ef), where we added a "shutting down" state, and started
responding to all create cells with DESTROY when shutting down.
This commit is contained in:
Nick Mathewson 2014-06-11 09:33:20 -04:00
parent af53e4bd1c
commit f9f450d688
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug12191
View File

@ -1,6 +1,7 @@
o Minor bugfixes: o Minor bugfixes:
- We now drop CREATE cells for already-existent circuit IDs, regardless - We now drop CREATE cells for already-existent circuit IDs and
of other factors that might otherwise have called for DESTROY cells. for zero-valued circuit IDs, regardless of other factors that
Fixes bug 12191; bugfix on 0.2.??? might otherwise have called for DESTROY cells. Fixes bug 12191;
bugfix on 0.0.8pre1.

19
src/or/command.c
View File

@ -227,6 +227,17 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
(unsigned)cell->circ_id, (unsigned)cell->circ_id,
U64_PRINTF_ARG(chan->global_identifier), chan); U64_PRINTF_ARG(chan->global_identifier), chan);
/* We check for the conditions that would make us drop the cell before
* we check for the conditions that would make us send a DESTROY back,
* since those conditions would make a DESTROY nonsensical. */
if (cell->circ_id == 0) {
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Received a create cell (type %d) from %s with zero circID; "
" ignoring.", (int)cell->command,
channel_get_actual_remote_descr(chan));
return;
}
if (circuit_id_in_use_on_channel(cell->circ_id, chan)) { if (circuit_id_in_use_on_channel(cell->circ_id, chan)) {
const node_t *node = node_get_by_id(chan->identity_digest); const node_t *node = node_get_by_id(chan->identity_digest);
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
@ -265,14 +276,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
return; return;
} }
if (cell->circ_id == 0) {
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Received a create cell (type %d) from %s with zero circID; "
" ignoring.", (int)cell->command,
channel_get_actual_remote_descr(chan));
return;
}
/* If the high bit of the circuit ID is not as expected, close the /* If the high bit of the circuit ID is not as expected, close the
* circ. */ * circ. */
if (chan->wide_circ_ids) if (chan->wide_circ_ids)