summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-23 08:54:45 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-23 08:54:45 -0500
commitc96465259a71741eb90486056a62376c3475007e (patch)
tree34be04b2286099fccb8270df4ed2c622b75087cd /src/test
parent83ab6adb10d4e6e10eccbbb65120d3e9f1a675f6 (diff)
downloadtor-c96465259a71741eb90486056a62376c3475007e.tar.gz
tor-c96465259a71741eb90486056a62376c3475007e.zip
dos: Change the DoS heartbeat line format
Fix a bug introduced in 94b56eaa7597e4a091a5b51d2c9032ea046631e3 which overwrite the connection message line. Furthermore, improve how we generate that line by using a smartlist and change the format so it is clearer of what is being rejected/detected and, if applicable, which option is disabled thus yielding no stats. Closes #40308 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_status.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_status.c b/src/test/test_status.c
index b938b86326..223aeffb3b 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -360,7 +360,9 @@ test_status_hb_not_in_consensus(void *arg)
"initiated 0 and received 0 v4 connections; "
"initiated 0 and received 0 v5 connections.\n");
expect_log_msg("DoS mitigation since startup: 0 circuits killed with "
- "too many cells. [cc not enabled] [conn not enabled] "
+ "too many cells, [DoSCircuitCreationEnabled disabled], "
+ "[DoSConnectionEnabled disabled], "
+ "[DoSRefuseSingleHopClientRendezvous disabled], "
"0 INTRODUCE2 rejected.\n");
tt_int_op(mock_saved_log_n_entries(), OP_EQ, 6);