From ce0efc2db4d1ff4b49bf318d5a2d5fb13607580f Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Mon, 11 Nov 2019 16:16:29 +0900 Subject: [PATCH] Update QUIC draft version numbers to 24 --- iocore/net/quic/Mock.h | 2 +- iocore/net/quic/QUICTypes.h | 2 +- iocore/net/quic/test/test_QUICPacketFactory.cc | 2 +- src/traffic_quic/quic_client.cc | 4 ++-- src/tscore/ink_inet.cc | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/iocore/net/quic/Mock.h b/iocore/net/quic/Mock.h index 6d0fc8563f9..2c4fa23b2c7 100644 --- a/iocore/net/quic/Mock.h +++ b/iocore/net/quic/Mock.h @@ -33,7 +33,7 @@ class MockQUICContext; using namespace std::literals; -std::string_view negotiated_application_name_sv = "h3-23"sv; +std::string_view negotiated_application_name_sv = "h3-24"sv; class MockQUICLDConfig : public QUICLDConfig { diff --git a/iocore/net/quic/QUICTypes.h b/iocore/net/quic/QUICTypes.h index 7c3a53796c7..88bb99d9f8e 100644 --- a/iocore/net/quic/QUICTypes.h +++ b/iocore/net/quic/QUICTypes.h @@ -51,7 +51,7 @@ static constexpr uint8_t kPacketNumberSpace = 3; // Note: Fix QUIC_ALPN_PROTO_LIST in QUICConfig.cc // Note: Change ExtensionType (QUICTransportParametersHandler::TRANSPORT_PARAMETER_ID) if it's changed constexpr QUICVersion QUIC_SUPPORTED_VERSIONS[] = { - 0xff000017, + 0xff000018, }; constexpr QUICVersion QUIC_EXERCISE_VERSION = 0x1a2a3a4a; diff --git a/iocore/net/quic/test/test_QUICPacketFactory.cc b/iocore/net/quic/test/test_QUICPacketFactory.cc index dc017658803..4d4a901f292 100644 --- a/iocore/net/quic/test/test_QUICPacketFactory.cc +++ b/iocore/net/quic/test/test_QUICPacketFactory.cc @@ -54,7 +54,7 @@ TEST_CASE("QUICPacketFactory_Create_VersionNegotiationPacket", "[quic]") 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, // Destination Connection ID 0x08, // SCID Len 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // Source Connection ID - 0xff, 0x00, 0x00, 0x17, // Supported Version + 0xff, 0x00, 0x00, 0x18, // Supported Version 0x1a, 0x2a, 0x3a, 0x4a, // Excercise Version }; uint8_t buf[1024] = {0}; diff --git a/src/traffic_quic/quic_client.cc b/src/traffic_quic/quic_client.cc index cdeca6fa51f..3b03d388bed 100644 --- a/src/traffic_quic/quic_client.cc +++ b/src/traffic_quic/quic_client.cc @@ -33,8 +33,8 @@ // https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_alpn_protos.html // Should be integrate with IP_PROTO_TAG_HTTP_QUIC in ts/ink_inet.h ? using namespace std::literals; -static constexpr std::string_view HQ_ALPN_PROTO_LIST("\5hq-23"sv); -static constexpr std::string_view H3_ALPN_PROTO_LIST("\5h3-23"sv); +static constexpr std::string_view HQ_ALPN_PROTO_LIST("\5hq-24"sv); +static constexpr std::string_view H3_ALPN_PROTO_LIST("\5h3-24"sv); QUICClient::QUICClient(const QUICClientConfig *config) : Continuation(new_ProxyMutex()), _config(config) { diff --git a/src/tscore/ink_inet.cc b/src/tscore/ink_inet.cc index 9f36ce9f9a8..681477b4281 100644 --- a/src/tscore/ink_inet.cc +++ b/src/tscore/ink_inet.cc @@ -50,8 +50,8 @@ const std::string_view IP_PROTO_TAG_HTTP_0_9("http/0.9"sv); const std::string_view IP_PROTO_TAG_HTTP_1_0("http/1.0"sv); const std::string_view IP_PROTO_TAG_HTTP_1_1("http/1.1"sv); const std::string_view IP_PROTO_TAG_HTTP_2_0("h2"sv); // HTTP/2 over TLS -const std::string_view IP_PROTO_TAG_HTTP_QUIC("hq-23"sv); // HTTP/0.9 over QUIC -const std::string_view IP_PROTO_TAG_HTTP_3("h3-23"sv); // HTTP/3 over QUIC +const std::string_view IP_PROTO_TAG_HTTP_QUIC("hq-24"sv); // HTTP/0.9 over QUIC +const std::string_view IP_PROTO_TAG_HTTP_3("h3-24"sv); // HTTP/3 over QUIC const std::string_view UNIX_PROTO_TAG{"unix"sv};