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

a stopgap measure while we wait for proposal 111: apply the

Browse Source 
stricter rate limiting to all OR conns except those that have
been touched by local circuits.


svn:r9882
This commit is contained in:
Roger Dingledine 2007-03-20 03:21:51 +00:00
parent b4f743562f
commit 93e7627694
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection.c
View File

@ -1119,10 +1119,8 @@ static int write_buckets_empty_last_second = 0;
static int
connection_counts_as_relayed_traffic(connection_t *conn)
{
#if 0
if (conn->type == CONN_TYPE_OR && TO_OR_CONN(conn)->bandwidth_class)
if (conn->type == CONN_TYPE_OR && !TO_OR_CONN(conn)->client_used)
return 1;
#endif
if (conn->type == CONN_TYPE_DIR && DIR_CONN_IS_SERVER(conn))
return 1;
return 0;

5
src/or/connection_edge.c
View File

@ -1792,6 +1792,11 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn,
log_info(LD_APP,"Address/port sent, ap socket %d, n_circ_id %d",
ap_conn->_base.s, circ->_base.n_circ_id);
control_event_stream_status(ap_conn, STREAM_EVENT_SENT_CONNECT, 0);
if ((TO_CIRCUIT(circ))->n_conn) {
/* mark it so it gets better rate limiting treatment. */
(TO_CIRCUIT(circ))->n_conn->client_used = 1;
}
return 0;
}

7
src/or/or.h
View File

@ -790,8 +790,11 @@ typedef struct or_connection_t {
char identity_digest[DIGEST_LEN];
char *nickname; /**< Nickname of OR on other side (if any). */
tor_tls_t *tls; /**< TLS connection state */
int tls_error; /**< Last tor_tls error code */
tor_tls_t *tls; /**< TLS connection state. */
int tls_error; /**< Last tor_tls error code. */
/** Whether we are using this conn for any client traffic. If we're
* not, we can rate limit it further. */
uint8_t client_used:1;
time_t timestamp_lastempty; /**< When was the outbuf last completely empty?*/