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

Merge branch 'bug31107_040' into bug31107_041

Browse Source
This commit is contained in:
Nick Mathewson 2019-09-17 09:16:52 -04:00
commit 6ee19e57c2
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug31107 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging, protocol violations):
- Do not log a nonfatal assertion failure when receiving a VERSIONS
cell on a connection using the obsolete v1 link protocol. Log a
protocol_warn instead. Fixes bug 31107; bugfix on 0.2.4.4-alpha.

10
src/core/or/channeltls.c
View File

@ -1106,7 +1106,15 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn)
/* do nothing */
break;
case CELL_VERSIONS:
tor_fragile_assert();
/* A VERSIONS cell should always be a variable-length cell, and
* so should never reach this function (which handles constant-sized
* cells). But if the connection is using the (obsolete) v1 link
* protocol, all cells will be treated as constant-sized, and so
* it's possible we'll reach this code.
*/
log_fn(LOG_PROTOCOL_WARN, LD_CHANNEL,
"Received unexpected VERSIONS cell on a channel using link "
"protocol %d; ignoring.", conn->link_proto);
break;
case CELL_NETINFO:
++stats_n_netinfo_cells_processed;