[tor-commits] [tor/master] Bulletproof our 11246 fix a little, based on recommendation from andrea.

[nickm at torproject.org]

commit b16321425f477bed0a3220378ff80ac22b805cb1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 4 12:27:10 2014 -0400

    Bulletproof our 11246 fix a little, based on recommendation from andrea.
---
 src/or/relay.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/or/relay.c b/src/or/relay.c
index f565f92..6289374 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1074,6 +1074,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
        * EXIT_CONN_STATE_CONNECTING or EXIT_CONN_STATE_RESOLVING.
        * This speeds up HTTP, for example. */
       optimistic_data = 1;
+    } else if (rh.stream_id == 0 && rh.command == RELAY_COMMAND_DATA) {
+      log_warn(LD_BUG, "Somehow I had a connection that matched a "
+               "data cell with stream ID 0.");
     } else {
       return connection_edge_process_relay_cell_not_open(
                &rh, cell, circ, conn, layer_hint);