torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

Browse Source
This commit is contained in:
Nick Mathewson
2018-02-13 15:00:43 -05:00
parent 412a8256a5 e7f6314782
commit 86f461e362
4 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/dos.c
+18
View File
@@ -309,6 +309,16 @@ cc_stats_refill_bucket(cc_client_stats_t *stats, const tor_addr_t *addr)
new_circuit_bucket_count = MIN(stats->circuit_bucket + (uint32_t)num_token,
dos_cc_circuit_burst);
}
/* This function is not allowed to make the bucket count larger than the
* burst value */
tor_assert_nonfatal(new_circuit_bucket_count <= dos_cc_circuit_burst);
/* This function is not allowed to make the bucket count smaller, unless it
* is decreasing it to a newly configured, lower burst value. We allow the
* bucket to stay the same size, in case the circuit rate is zero. */
tor_assert_nonfatal(new_circuit_bucket_count >= stats->circuit_bucket ||
new_circuit_bucket_count == dos_cc_circuit_burst);
log_debug(LD_DOS, "DoS address %s has its circuit bucket value: %" PRIu32
". Filling it to %" PRIu32 ". Circuit rate is %" PRIu64
". Elapsed time is %" PRIi64,
@@ -738,6 +748,14 @@ dos_close_client_conn(const or_connection_t *or_conn)
void
dos_consensus_has_changed(const networkstatus_t *ns)
{
/* There are two ways to configure this subsystem, one at startup through
* dos_init() which is called when the options are parsed. And this one
* through the consensus. We don't want to enable any DoS mitigation if we
* aren't a public relay. */
if (!public_server_mode(get_options())) {
return;
}
cc_consensus_has_changed(ns);
conn_consensus_has_changed(ns);