trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mas...@apache.org
Subject [trafficserver] branch quic-latest updated: Update tests for H3
Date Fri, 12 Apr 2019 07:05:30 GMT
This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/quic-latest by this push:
     new 31f60ad  Update tests for H3
31f60ad is described below

commit 31f60ade6cb8293e1b943b0b4afdddc7422890fb
Author: Masakazu Kitajo <maskit@apache.org>
AuthorDate: Fri Apr 12 16:05:04 2019 +0900

    Update tests for H3
---
 proxy/http3/Http3Frame.cc           |  8 ++++++--
 proxy/http3/test/test_Http3Frame.cc | 40 ++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/proxy/http3/Http3Frame.cc b/proxy/http3/Http3Frame.cc
index 446387d..2f56b3f 100644
--- a/proxy/http3/Http3Frame.cc
+++ b/proxy/http3/Http3Frame.cc
@@ -48,7 +48,7 @@ Http3Frame::type(const uint8_t *buf, size_t buf_len)
   size_t type_field_length = 0;
   int ret                  = QUICVariableInt::decode(type, type_field_length, buf, buf_len);
   ink_assert(ret != 1);
-  if (type <= static_cast<uint8_t>(Http3FrameType::X_MAX_DEFINED)) {
+  if (type <= static_cast<uint64_t>(Http3FrameType::X_MAX_DEFINED)) {
     return static_cast<Http3FrameType>(type);
   } else {
     return Http3FrameType::UNKNOWN;
@@ -92,7 +92,11 @@ Http3Frame::length() const
 Http3FrameType
 Http3Frame::type() const
 {
-  return this->_type;
+  if (static_cast<uint64_t>(this->_type) <= static_cast<uint64_t>(Http3FrameType::X_MAX_DEFINED))
{
+    return this->_type;
+  } else {
+    return Http3FrameType::UNKNOWN;
+  }
 }
 
 void
diff --git a/proxy/http3/test/test_Http3Frame.cc b/proxy/http3/test/test_Http3Frame.cc
index 48f02ae..c9a606a 100644
--- a/proxy/http3/test/test_Http3Frame.cc
+++ b/proxy/http3/test/test_Http3Frame.cc
@@ -30,8 +30,8 @@ TEST_CASE("Http3Frame Type", "[http3]")
 {
   CHECK(Http3Frame::type(reinterpret_cast<const uint8_t *>("\x00\x00"), 2) == Http3FrameType::DATA);
   // Undefined ragne
-  CHECK(Http3Frame::type(reinterpret_cast<const uint8_t *>("\x00\x0f"), 2) == Http3FrameType::UNKNOWN);
-  CHECK(Http3Frame::type(reinterpret_cast<const uint8_t *>("\x00\xff"), 2) == Http3FrameType::UNKNOWN);
+  CHECK(Http3Frame::type(reinterpret_cast<const uint8_t *>("\x0f\x00"), 2) == Http3FrameType::UNKNOWN);
+  CHECK(Http3Frame::type(reinterpret_cast<const uint8_t *>("\xff\xff\xff\xff\xff\xff\xff\x00"),
9) == Http3FrameType::UNKNOWN);
 }
 
 TEST_CASE("Load DATA Frame", "[http3]")
@@ -39,8 +39,8 @@ TEST_CASE("Load DATA Frame", "[http3]")
   SECTION("No flags")
   {
     uint8_t buf1[] = {
-      0x04,                   // Length
       0x00,                   // Type
+      0x04,                   // Length
       0x11, 0x22, 0x33, 0x44, // Payload
     };
     std::shared_ptr<const Http3Frame> frame1 = Http3FrameFactory::create(buf1, sizeof(buf1));
@@ -56,8 +56,8 @@ TEST_CASE("Load DATA Frame", "[http3]")
   SECTION("Have flags (invalid)")
   {
     uint8_t buf1[] = {
-      0x04,                   // Length
       0x00,                   // Type
+      0x04,                   // Length
       0x11, 0x22, 0x33, 0x44, // Payload
     };
     std::shared_ptr<const Http3Frame> frame1 = Http3FrameFactory::create(buf1, sizeof(buf1));
@@ -78,8 +78,8 @@ TEST_CASE("Store DATA Frame", "[http3]")
     uint8_t buf[32] = {0};
     size_t len;
     uint8_t expected1[] = {
-      0x04,                   // Length
       0x00,                   // Type
+      0x04,                   // Length
       0x11, 0x22, 0x33, 0x44, // Payload
     };
 
@@ -103,8 +103,8 @@ TEST_CASE("Store HEADERS Frame", "[http3]")
     uint8_t buf[32] = {0};
     size_t len;
     uint8_t expected1[] = {
-      0x04,                   // Length
       0x01,                   // Type
+      0x04,                   // Length
       0x11, 0x22, 0x33, 0x44, // Payload
     };
 
@@ -126,13 +126,13 @@ TEST_CASE("Load SETTINGS Frame", "[http3]")
   SECTION("Normal")
   {
     uint8_t buf[] = {
-      0x0a,       // Length
       0x04,       // Type
-      0x00, 0x06, // Identifier
+      0x08,       // Length
+      0x06,       // Identifier
       0x44, 0x00, // Value
-      0x00, 0x08, // Identifier
+      0x08,       // Identifier
       0x0f,       // Value
-      0xba, 0xba, // Identifier
+      0x4a, 0xba, // Identifier
       0x00,       // Value
     };
 
@@ -153,13 +153,13 @@ TEST_CASE("Store SETTINGS Frame", "[http3]")
   SECTION("Normal")
   {
     uint8_t expected[] = {
-      0x0a,       // Length
       0x04,       // Type
-      0x00, 0x06, // Identifier
+      0x08,       // Length
+      0x06,       // Identifier
       0x44, 0x00, // Value
-      0x00, 0x08, // Identifier
+      0x08,       // Identifier
       0x0f,       // Value
-      0x0a, 0x0a, // Identifier
+      0x4a, 0x0a, // Identifier
       0x00,       // Value
     };
 
@@ -177,11 +177,11 @@ TEST_CASE("Store SETTINGS Frame", "[http3]")
   SECTION("Normal from Client")
   {
     uint8_t expected[] = {
-      0x07,       // Length
       0x04,       // Type
-      0x00, 0x06, // Identifier
+      0x06,       // Length
+      0x06,       // Identifier
       0x44, 0x00, // Value
-      0x0a, 0x0a, // Identifier
+      0x4a, 0x0a, // Identifier
       0x00,       // Value
     };
 
@@ -199,8 +199,8 @@ TEST_CASE("Store SETTINGS Frame", "[http3]")
 TEST_CASE("Http3FrameFactory Create Unknown Frame", "[http3]")
 {
   uint8_t buf1[] = {
+    0x0f, // Type
     0x00, // Length
-    0xff, // Type
   };
   std::shared_ptr<const Http3Frame> frame1 = Http3FrameFactory::create(buf1, sizeof(buf1));
   CHECK(frame1);
@@ -213,13 +213,13 @@ TEST_CASE("Http3FrameFactory Fast Create Frame", "[http3]")
   Http3FrameFactory factory;
 
   uint8_t buf1[] = {
-    0x04,                   // Length
     0x00,                   // Type
+    0x04,                   // Length
     0x11, 0x22, 0x33, 0x44, // Payload
   };
   uint8_t buf2[] = {
-    0x04,                   // Length
     0x00,                   // Type
+    0x04,                   // Length
     0xaa, 0xbb, 0xcc, 0xdd, // Payload
   };
   std::shared_ptr<const Http3Frame> frame1 = factory.fast_create(buf1, sizeof(buf1));


Mime
View raw message