nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

whitespace fixes to pass 'make check-spaces'

Browse Source
This commit is contained in:
Roger Dingledine 2011-03-15 16:59:58 -04:00
parent 6a97450cbd
commit c2775196f7
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/connection.c
View File

@ -3264,7 +3264,7 @@ _connection_write_to_buf_impl(const char *string, size_t len,
* conn->write_event won't be set yet. Otherwise, write data from * conn->write_event won't be set yet. Otherwise, write data from
* this conn as the socket is available. */ * this conn as the socket is available. */
if (conn->write_event) { if (conn->write_event) {
connection_start_writing(conn); connection_start_writing(conn);
} }
if (zlib) { if (zlib) {
conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen; conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen;
@ -3845,9 +3845,11 @@ assert_connection_ok(connection_t *conn, time_t now)
* EXIT_CONN_STATE_RESOLVING while the conn is not yet marked to writing. * EXIT_CONN_STATE_RESOLVING while the conn is not yet marked to writing.
* */ * */
tor_assert((conn->type == CONN_TYPE_EXIT && tor_assert((conn->type == CONN_TYPE_EXIT &&
conn->state == EXIT_CONN_STATE_RESOLVING) || conn->state == EXIT_CONN_STATE_RESOLVING) ||
connection_is_writing(conn) || conn->write_blocked_on_bw || connection_is_writing(conn) ||
(CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->edge_blocked_on_circ)); conn->write_blocked_on_bw ||
(CONN_IS_EDGE(conn) &&
TO_EDGE_CONN(conn)->edge_blocked_on_circ));
} }
if (conn->hold_open_until_flushed) if (conn->hold_open_until_flushed)

24
src/or/relay.c
View File

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