diff options
| author | Alexander Færøy <ahf@torproject.org> | 2023-09-19 18:34:27 +0200 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2023-09-19 18:34:27 +0200 |
| commit | b855a786b6e7825600e2cc01a9e2c02f4f9b925f (patch) | |
| tree | 86fd41d1c089cfa41d9c32379865096fd71aebea /src/test/test_status.c | |
| parent | c884a07f08881cb82ce01fda766e8b3099365bf2 (diff) | |
| download | tor-b855a786b6e7825600e2cc01a9e2c02f4f9b925f.tar.gz tor-b855a786b6e7825600e2cc01a9e2c02f4f9b925f.zip | |
Handle ntor and ntor_v3 individually in rephist and for MetricsPort.
This patch should not mess with the DoS protection here.
Fixes tpo/core/tor#40638.
Diffstat (limited to 'src/test/test_status.c')
| -rw-r--r-- | src/test/test_status.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/test/test_status.c b/src/test/test_status.c index 1d371645ae..5873d8e5c3 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -333,10 +333,12 @@ test_status_hb_not_in_consensus(void *arg) status_hb_not_in_consensus_server_mode); log_global_min_severity_ = LOG_DEBUG; - onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP] = 1; onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_TAP] = 1; - onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR] = 1; - onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_NTOR] = 1; + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP] = 2; + onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_NTOR] = 3; + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR] = 4; + onion_handshakes_assigned[ONION_HANDSHAKE_TYPE_NTOR_V3] = 5; + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR_V3] = 6; expected = 0; setup_capture_of_logs(LOG_INFO); @@ -352,8 +354,8 @@ test_status_hb_not_in_consensus(void *arg) "I've made 0 connections with IPv4 and 0 with IPv6.\n"); expect_log_msg("Average packaged cell fullness: 100.000%. " "TLS write overhead: 0%\n"); - expect_log_msg("Circuit handshake stats since last time: 1/1 TAP, " - "1/1 NTor.\n"); + expect_log_msg("Circuit handshake stats since last time: 1/2 TAP, " + "3/4 NTor, 5/6 NTor (v3).\n"); expect_log_msg("Since startup we initiated 0 and received 0 v1 " "connections; initiated 0 and received 0 v2 connections; " "initiated 0 and received 0 v3 connections; " |