Unverified Commit c06d540f authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9

parents 752c35ca 3c97ab3c
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.
......@@ -1098,7 +1098,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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment