Update QUIC draft version numbers to 29

maskit · Jul 14, 2020 · e5fb638 · e5fb638
1 parent a9ef9b0
commit e5fb638
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/iocore/net/quic/Mock.h b/iocore/net/quic/Mock.h
@@ -40,7 +40,7 @@
 class MockQUICContext;
 
 using namespace std::literals;
-std::string_view negotiated_application_name_sv = "h3-28"sv;
+std::string_view negotiated_application_name_sv = "h3-29"sv;
 
 class MockQUICLDConfig : public QUICLDConfig
 {

diff --git a/iocore/net/quic/QUICTypes.h b/iocore/net/quic/QUICTypes.h
@@ -53,7 +53,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[] = {
-  0xff00001c,
+  0xff00001d,
   0xff00001b,
 };
 constexpr QUICVersion QUIC_EXERCISE_VERSION1 = 0x1a2a3a4a;

diff --git a/iocore/net/quic/test/test_QUICPacketFactory.cc b/iocore/net/quic/test/test_QUICPacketFactory.cc
@@ -56,7 +56,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, 0x1c,                         // Supported Version
+    0xff, 0x00, 0x00, 0x1d,                         // Supported Version
     0xff, 0x00, 0x00, 0x1b,                         // Supported Version
     0x5a, 0x6a, 0x7a, 0x8a,                         // Excercise Version
   };

diff --git a/src/traffic_quic/quic_client.cc b/src/traffic_quic/quic_client.cc
@@ -34,8 +34,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-28\5hq-27"sv);
-static constexpr std::string_view H3_ALPN_PROTO_LIST("\5h3-28\5h3-27"sv);
+static constexpr std::string_view HQ_ALPN_PROTO_LIST("\5hq-29\5hq-27"sv);
+static constexpr std::string_view H3_ALPN_PROTO_LIST("\5h3-29\5h3-27"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
@@ -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-28"sv);     // HTTP/0.9 over QUIC
-const std::string_view IP_PROTO_TAG_HTTP_3("h3-28"sv);        // HTTP/3 over QUIC
+const std::string_view IP_PROTO_TAG_HTTP_QUIC("hq-29"sv);     // HTTP/0.9 over QUIC
+const std::string_view IP_PROTO_TAG_HTTP_3("h3-29"sv);        // HTTP/3 over QUIC
 const std::string_view IP_PROTO_TAG_HTTP_QUIC_D27("hq-27"sv); // HTTP/0.9 over QUIC (draft-27)
 const std::string_view IP_PROTO_TAG_HTTP_3_D27("h3-27"sv);    // HTTP/3 over QUIC (draft-27)