mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge branch 'bug31107_041' into bug31107_master
This commit is contained in:
commit
4d7ce27105
4
changes/bug31107
Normal file
4
changes/bug31107
Normal 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.
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user