Skip to content

Commit

Permalink
Update QUIC draft version numbers to 27
Browse files Browse the repository at this point in the history
  • Loading branch information
maskit committed Apr 3, 2020
1 parent 4f69d00 commit c6221cf
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion iocore/net/quic/Mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
class MockQUICContext;

using namespace std::literals;
std::string_view negotiated_application_name_sv = "h3-25"sv;
std::string_view negotiated_application_name_sv = "h3-27"sv;

class MockQUICLDConfig : public QUICLDConfig
{
Expand Down
2 changes: 1 addition & 1 deletion iocore/net/quic/QUICTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
0xff000019,
0xff00001b,
};
constexpr QUICVersion QUIC_EXERCISE_VERSION = 0x1a2a3a4a;

Expand Down
2 changes: 1 addition & 1 deletion iocore/net/quic/test/test_QUICPacketFactory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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, 0x19, // Supported Version
0xff, 0x00, 0x00, 0x1b, // Supported Version
0x1a, 0x2a, 0x3a, 0x4a, // Excercise Version
};
uint8_t buf[1024] = {0};
Expand Down
4 changes: 2 additions & 2 deletions src/traffic_quic/quic_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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-25"sv);
static constexpr std::string_view H3_ALPN_PROTO_LIST("\5h3-25"sv);
static constexpr std::string_view HQ_ALPN_PROTO_LIST("\5hq-27"sv);
static constexpr std::string_view H3_ALPN_PROTO_LIST("\5h3-27"sv);

QUICClient::QUICClient(const QUICClientConfig *config) : Continuation(new_ProxyMutex()), _config(config)
{
Expand Down
4 changes: 2 additions & 2 deletions src/tscore/ink_inet.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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-25"sv); // HTTP/0.9 over QUIC
const std::string_view IP_PROTO_TAG_HTTP_3("h3-25"sv); // HTTP/3 over QUIC
const std::string_view IP_PROTO_TAG_HTTP_QUIC("hq-27"sv); // HTTP/0.9 over QUIC
const std::string_view IP_PROTO_TAG_HTTP_3("h3-27"sv); // HTTP/3 over QUIC

const std::string_view UNIX_PROTO_TAG{"unix"sv};

Expand Down

0 comments on commit c6221cf

Please sign in to comment.