Commit c2775196 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

whitespace fixes to pass 'make check-spaces'

parent 6a97450c

src/or/connection.c

+6 −4
Original line number Diff line number Diff line
@@ -3846,8 +3846,10 @@ assert_connection_ok(connection_t *conn, time_t now) 
     * */

    tor_assert((conn->type == CONN_TYPE_EXIT &&

                conn->state == EXIT_CONN_STATE_RESOLVING) ||

	    connection_is_writing(conn) || conn->write_blocked_on_bw ||

            (CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->edge_blocked_on_circ));

               connection_is_writing(conn) ||

               conn->write_blocked_on_bw ||

               (CONN_IS_EDGE(conn) &&

                TO_EDGE_CONN(conn)->edge_blocked_on_circ));

  }



  if (conn->hold_open_until_flushed)

src/or/relay.c

+12 −12
Original line number Diff line number Diff line
@@ -1032,8 +1032,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, 
  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.*/

                            * that's in the EXIT_CONN_STATE_RESOLVING

                            * or EXIT_CONN_STATE_CONNECTING states. */



  tor_assert(cell);

  tor_assert(circ);
@@ -1058,9 +1058,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, 
        (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. */

      /* 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(