From 20d56f8afbcf374130b6cf416dae54269b1322d2 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Tue, 6 Feb 2024 13:00:04 +0200 Subject: [PATCH 1/2] fix: Only allow v1 for most interop runner runs --- neqo-client/src/main.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neqo-client/src/main.rs b/neqo-client/src/main.rs index d8444542ea..89ced97233 100644 --- a/neqo-client/src/main.rs +++ b/neqo-client/src/main.rs @@ -1005,6 +1005,8 @@ async fn main() -> Res<()> { let mut args = Args::from_args(); if let Some(testcase) = args.qns_test.as_ref() { + // Only allow v1 for QNS tests. + args.quic_parameters.quic_version = vec![VersionArg(Version::Version1)]; match testcase.as_str() { "http3" => {} "handshake" | "transfer" | "retry" => { @@ -1034,6 +1036,9 @@ async fn main() -> Res<()> { } "v2" => { args.use_old_http = true; + // Allow v2 for this QNS test. + args.quic_parameters.quic_version = + vec![VersionArg(Version::Version1), VersionArg(Version::Version2)]; } _ => exit(127), } From 1625b29e5bf627ed0d29bd8e54957b95f2b6a6ae Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Tue, 6 Feb 2024 14:57:46 +0200 Subject: [PATCH 2/2] Fix v2 --- neqo-client/src/main.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neqo-client/src/main.rs b/neqo-client/src/main.rs index 89ced97233..931ce5a6e4 100644 --- a/neqo-client/src/main.rs +++ b/neqo-client/src/main.rs @@ -1005,9 +1005,10 @@ async fn main() -> Res<()> { let mut args = Args::from_args(); if let Some(testcase) = args.qns_test.as_ref() { - // Only allow v1 for QNS tests. + // Only use v1 for most QNS tests. args.quic_parameters.quic_version = vec![VersionArg(Version::Version1)]; match testcase.as_str() { + // TODO: Add "ecn" when that is ready. "http3" => {} "handshake" | "transfer" | "retry" => { args.use_old_http = true; @@ -1036,9 +1037,8 @@ async fn main() -> Res<()> { } "v2" => { args.use_old_http = true; - // Allow v2 for this QNS test. - args.quic_parameters.quic_version = - vec![VersionArg(Version::Version1), VersionArg(Version::Version2)]; + // Use default version set for this test (which allows compatible vneg.) + args.quic_parameters.quic_version.clear(); } _ => exit(127), }