mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
minor cleanups
svn:r11890
This commit is contained in:
@@ -102,7 +102,6 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn,
|
||||
} else {
|
||||
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT_DIR) {
|
||||
/* don't use three-hop circuits -- that could hurt our anonymity. */
|
||||
// log_debug(LD_CIRC,"Skipping multi-hop circuit for CONNECT_DIR.");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -529,8 +529,8 @@ connection_about_to_close_connection(connection_t *conn)
|
||||
}
|
||||
}
|
||||
|
||||
/** Return true iff connection_close_immediate has been called on this
|
||||
* connection */
|
||||
/** Return true iff connection_close_immediate() has been called on this
|
||||
* connection. */
|
||||
#define CONN_IS_CLOSED(c) \
|
||||
((c)->linked ? ((c)->linked_conn_is_closed) : ((c)->s < 0))
|
||||
|
||||
@@ -2271,7 +2271,7 @@ _connection_write_to_buf_impl(const char *string, size_t len,
|
||||
if (conn->type == CONN_TYPE_OR &&
|
||||
conn->outbuf_flushlen-len < MIN_TLS_FLUSHLEN &&
|
||||
conn->outbuf_flushlen >= MIN_TLS_FLUSHLEN) {
|
||||
/* We just pushed outbuf_flushelen to MIN_TLS_FLUSHLEN or above;
|
||||
/* We just pushed outbuf_flushlen to MIN_TLS_FLUSHLEN or above;
|
||||
* we can send out a full TLS frame now if we like. */
|
||||
extra = conn->outbuf_flushlen - MIN_TLS_FLUSHLEN;
|
||||
conn->outbuf_flushlen = MIN_TLS_FLUSHLEN;
|
||||
@@ -2671,7 +2671,7 @@ connection_finished_flushing(connection_t *conn)
|
||||
{
|
||||
tor_assert(conn);
|
||||
|
||||
/* If the connection is don't try to do anything more here. */
|
||||
/* If the connection is closed, don't try to do anything more here. */
|
||||
if (CONN_IS_CLOSED(conn))
|
||||
return 0;
|
||||
|
||||
|
||||
+2
-2
@@ -781,8 +781,8 @@ typedef struct connection_t {
|
||||
/** True iff we're currently able to read on the linked conn, and our
|
||||
* read_event should be made active with libevent. */
|
||||
unsigned int active_on_link:1;
|
||||
/** True iff we've called connection_close_immediate on this linked
|
||||
* connection */
|
||||
/** True iff we've called connection_close_immediate() on this linked
|
||||
* connection. */
|
||||
unsigned int linked_conn_is_closed:1;
|
||||
|
||||
int s; /**< Our socket; -1 if this connection is closed, or has no
|
||||
|
||||
Reference in New Issue
Block a user