|
@@ -1031,9 +1031,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
|
|
|
relay_header_t rh;
|
|
|
unsigned domain = layer_hint?LD_APP:LD_EXIT;
|
|
|
int reason;
|
|
|
- int optimistic_data = 0; /* Set to 1 if we receive data on a stream
|
|
|
- that's in the EXIT_CONN_STATE_RESOLVING
|
|
|
- or EXIT_CONN_STATE_CONNECTING states.*/
|
|
|
+ int optimistic_data = 0; /* Set to 1 if we receive data on a stream
|
|
|
+ * that's in the EXIT_CONN_STATE_RESOLVING
|
|
|
+ * or EXIT_CONN_STATE_CONNECTING states. */
|
|
|
|
|
|
tor_assert(cell);
|
|
|
tor_assert(circ);
|
|
@@ -1055,16 +1055,16 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
|
|
|
|
|
|
if (conn && !connection_state_is_open(TO_CONN(conn))) {
|
|
|
if (conn->_base.type == CONN_TYPE_EXIT &&
|
|
|
- (conn->_base.state == EXIT_CONN_STATE_CONNECTING ||
|
|
|
- conn->_base.state == EXIT_CONN_STATE_RESOLVING) &&
|
|
|
- rh.command == RELAY_COMMAND_DATA) {
|
|
|
- /* We're going to allow DATA cells to be delivered to an exit
|
|
|
- * node in state EXIT_CONN_STATE_CONNECTING or
|
|
|
- * EXIT_CONN_STATE_RESOLVING. This speeds up HTTP, for example. */
|
|
|
- optimistic_data = 1;
|
|
|
+ (conn->_base.state == EXIT_CONN_STATE_CONNECTING ||
|
|
|
+ conn->_base.state == EXIT_CONN_STATE_RESOLVING) &&
|
|
|
+ rh.command == RELAY_COMMAND_DATA) {
|
|
|
+ /* Allow DATA cells to be delivered to an exit node in state
|
|
|
+ * EXIT_CONN_STATE_CONNECTING or EXIT_CONN_STATE_RESOLVING.
|
|
|
+ * This speeds up HTTP, for example. */
|
|
|
+ optimistic_data = 1;
|
|
|
} else {
|
|
|
- return connection_edge_process_relay_cell_not_open(
|
|
|
- &rh, cell, circ, conn, layer_hint);
|
|
|
+ return connection_edge_process_relay_cell_not_open(
|
|
|
+ &rh, cell, circ, conn, layer_hint);
|
|
|
}
|
|
|
}
|
|
|
|