diff options
| author | Matt Caswell <matt@openssl.org> | 2023-06-13 13:08:00 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-06-28 09:53:22 +1000 |
| commit | b49d9de0e66a5fe7570652186e3bb8c4a4d9f556 (patch) | |
| tree | 102358075f30e8c3c25e5bd70ba38fb1a061deed /test | |
| parent | 23fe02e59785f0cfaa6d50aa3fa0d82bffe22a8d (diff) | |
| download | openssl-b49d9de0e66a5fe7570652186e3bb8c4a4d9f556.tar.gz | |
The CC wake up deadline is now if we have TX allowance
If we have TX allowance then there is no need to wait if we have something
to send - the wake up deadline is immediate.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21204)
Diffstat (limited to 'test')
| -rw-r--r-- | test/quic_cc_test.c | 7 | ||||
| -rw-r--r-- | test/recipes/75-test_quicapi_data/ssltraceref.txt | 12 |
2 files changed, 4 insertions, 15 deletions
diff --git a/test/quic_cc_test.c b/test/quic_cc_test.c index 8d75a642c8..a6b45e3ed6 100644 --- a/test/quic_cc_test.c +++ b/test/quic_cc_test.c @@ -515,11 +515,8 @@ static int test_sanity(void) if (!TEST_uint64_t_ge(allowance = ccm->get_tx_allowance(cc), 1472)) goto err; - /* - * No wakeups should be scheduled currently as we don't currently implement - * pacing. - */ - if (!TEST_true(ossl_time_is_infinite(ccm->get_wakeup_deadline(cc)))) + /* There is TX allowance so wakeup should be immediate */ + if (!TEST_true(ossl_time_is_zero(ccm->get_wakeup_deadline(cc)))) goto err; /* No bytes should currently be in flight. */ diff --git a/test/recipes/75-test_quicapi_data/ssltraceref.txt b/test/recipes/75-test_quicapi_data/ssltraceref.txt index 095a945f6e..e1510ccd87 100644 --- a/test/recipes/75-test_quicapi_data/ssltraceref.txt +++ b/test/recipes/75-test_quicapi_data/ssltraceref.txt @@ -234,7 +234,7 @@ YeeuLO02zToHhnQ6KbPXOrQAqcL1kngO4g+j/ru+4AZThFkdkGnltvk= No extensions Received Datagram - Length: 256 + Length: 234 Received Packet Packet Type: Handshake Version: 0x00000001 @@ -267,8 +267,6 @@ Header: Finished, Length=32 verify_data (len=32): ???????????????????????????????????????????????????????????????? - -Received Frame: Ping Sent Frame: Ack (without ECN) Largest acked: 1 Ack delay (raw) 0 @@ -284,11 +282,5 @@ Sent Packet Source Conn Id: <zero length id> Payload length: 60 Packet Number: 0x00000000 -Sent Frame: Ack (without ECN) - Largest acked: 0 - Ack delay (raw) 0 - Ack range count: 0 - First ack range: 0 - Sent Datagram - Length: 115 + Length: 81 |