Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions quic/s2n-quic-qns/etc/run_endpoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ if [ "$QNS_MODE" == "interop" ]; then
SERVER_PARAMS+=" --application-protocols h3"
CLIENT_PARAMS+=" --application-protocols h3"
fi

if [ "$TESTCASE" == "ecn" ]; then
# The ECN test requires all packets set an ECT codepoint to pass. s2n-quic temporarily
# stops setting the ECT codepoint after 10 packets in case faulty equipment drops
# ECT marked packets (see https://datatracker.ietf.org/doc/html/rfc9000#section-13.4.2)
# To increase the chance this test completes in 10 packets or less, we disable
# MTU probing to avoid sending MTU probes that contribute to the 10 packet limit.
# 1228 is the minimum allowed MaxMtu, see `s2n_quic_core::path::MaxMtu::MIN`
SERVER_PARAMS+=" --max-mtu 1228"
CLIENT_PARAMS+=" --max-mtu 1228"
fi
fi

if [ "$QNS_MODE" == "interop" ]; then
Expand Down
2 changes: 1 addition & 1 deletion quic/s2n-quic-qns/src/client/interop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub struct Interop {
#[structopt(long, env = "TESTCASE", possible_values = &Testcase::supported(is_supported_testcase))]
testcase: Option<Testcase>,

#[structopt(long, default_value = "10")]
#[structopt(long, default_value = "20")]
concurrency: u64,

#[structopt(min_values = 1, required = true)]
Expand Down
12 changes: 12 additions & 0 deletions quic/s2n-quic-qns/src/limits.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

use core::time::Duration;

#[derive(Debug, structopt::StructOpt)]
pub struct Limits {
/// The maximum bits/sec for each connection
Expand All @@ -16,6 +18,12 @@ pub struct Limits {
}

impl Limits {
// Increase the MaxHandshakeDuration from the default of 10 seconds
const MAX_HANDSHAKE_DURATION: Duration = Duration::from_secs(60);

// Increase MaxIdleTimeout from the default of 30 seconds
const MAX_IDLE_TIMEOUT: Duration = Duration::from_secs(60);

pub fn limits(&self) -> s2n_quic::provider::limits::Limits {
let data_window = self.data_window();

Expand All @@ -31,6 +39,10 @@ impl Limits {
.with_bidirectional_remote_data_window(data_window)
.unwrap()
.with_unidirectional_data_window(data_window)
.unwrap()
.with_max_handshake_duration(Self::MAX_HANDSHAKE_DURATION)
.unwrap()
.with_max_idle_timeout(Self::MAX_IDLE_TIMEOUT)
.unwrap();

if let Some(size) = self.stream_send_buffer_size {
Expand Down