Update QUICHE from 3c9db14bb to dbc5afc11 (#37235)

https://github.com/google/quiche/compare/3c9db14bb..dbc5afc11 Risk Level: Low Testing: Existing tests pass Docs Changes: N/A Release Notes: N/A Platform Specific Features: N/A --------- Signed-off-by: Ricardo Perez Perez <[email protected]>
envoyproxy · Nov 19, 2024 · ee0f033 · ee0f033
1 parent a4c2d71
commit ee0f033
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 103 deletions.
diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
@@ -1528,7 +1528,6 @@ envoy_cc_library(
         ":quic_core_time_lib",
         ":quic_platform_base",
         ":quic_platform_hostname_utils",
-        ":quic_platform_mutex",
     ],
 )
 
@@ -1571,19 +1570,6 @@ envoy_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "quic_platform_mutex",
-    hdrs = [
-        "quiche/quic/platform/api/quic_mutex.h",
-    ],
-    repository = "@envoy",
-    tags = ["nofips"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":quiche_common_platform_mutex",
-    ],
-)
-
 envoy_cc_library(
     name = "quic_platform_base",
     hdrs = [
@@ -2780,7 +2766,6 @@ envoy_cc_library(
         ":quiche_common_platform_export",
         ":quiche_common_platform_iovec",
         ":quiche_common_platform_logging",
-        ":quiche_common_platform_prefetch",
     ],
 )
 
@@ -4778,30 +4763,6 @@ envoy_cc_library(
     }),
 )
 
-envoy_cc_library(
-    name = "quiche_common_platform_prefetch",
-    hdrs = [
-        "quiche/common/platform/api/quiche_prefetch.h",
-    ],
-    repository = "@envoy",
-    tags = ["nofips"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":quiche_common_platform_default_quiche_platform_impl_prefetch_impl_lib",
-        ":quiche_common_platform_export",
-    ],
-)
-
-envoy_quiche_platform_impl_cc_library(
-    name = "quiche_common_platform_default_quiche_platform_impl_prefetch_impl_lib",
-    hdrs = [
-        "quiche/common/platform/default/quiche_platform_impl/quiche_prefetch_impl.h",
-    ],
-    deps = [
-        ":quiche_common_platform_export",
-    ],
-)
-
 envoy_quiche_platform_impl_cc_library(
     name = "quiche_common_mobile_quiche_logging_lib",
     srcs = [
@@ -4818,37 +4779,6 @@ envoy_quiche_platform_impl_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "quiche_common_platform_mutex",
-    srcs = [
-        "quiche/common/platform/api/quiche_mutex.cc",
-    ],
-    hdrs = [
-        "quiche/common/platform/api/quiche_mutex.h",
-    ],
-    repository = "@envoy",
-    tags = ["nofips"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":quiche_common_platform_default_quiche_platform_impl_mutex_impl_lib",
-        ":quiche_common_platform_export",
-    ],
-)
-
-envoy_quiche_platform_impl_cc_library(
-    name = "quiche_common_platform_default_quiche_platform_impl_mutex_impl_lib",
-    srcs = [
-        "quiche/common/platform/default/quiche_platform_impl/quiche_mutex_impl.cc",
-    ],
-    hdrs = [
-        "quiche/common/platform/default/quiche_platform_impl/quiche_mutex_impl.h",
-    ],
-    deps = [
-        ":quiche_common_platform_export",
-        "@com_google_absl//absl/synchronization",
-    ],
-)
-
 envoy_cc_library(
     name = "quiche_common_platform_hostname_utils",
     srcs = [
@@ -5024,7 +4954,6 @@ envoy_cc_library(
         ":quiche_common_platform_default_quiche_platform_impl_testvalue_impl_lib",
         ":quiche_common_platform_export",
         ":quiche_common_platform_logging",
-        ":quiche_common_platform_prefetch",
         "@envoy//source/common/quic/platform:quic_base_impl_lib",
         "@envoy//source/common/quic/platform:quiche_flags_impl_lib",
         "@envoy//source/common/quic/platform:quiche_mem_slice_impl_lib",

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1225,12 +1225,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "QUICHE",
         project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols",
         project_url = "https://github.com/google/quiche",
-        version = "3c9db14bb3f5d479845bff8316988d053c7250d8",
-        sha256 = "11a7bd03d52c6f78d842ddbee8e7eb106596c80ac9c54de01a7843f44da6ea15",
+        version = "dbc5afc116f8279911c06b2d2ea47723c2ade20e",
+        sha256 = "981b2bd789d7279b557f35fa0a930df76d396e14059d8e493f42321753b60a08",
         urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
         strip_prefix = "quiche-{version}",
         use_category = ["controlplane", "dataplane_core"],
-        release_date = "2024-11-13",
+        release_date = "2024-11-18",
         cpe = "N/A",
         license = "BSD-3-Clause",
         license_url = "https://github.com/google/quiche/blob/{version}/LICENSE",

diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc
@@ -105,6 +105,7 @@ int reasonToReset(StreamResetReason reason) {
 }
 
 using Http2ResponseCodeDetails = ConstSingleton<Http2ResponseCodeDetailValues>;
+using OnHeaderResult = http2::adapter::Http2VisitorInterface::OnHeaderResult;
 
 enum Settings {
   // SETTINGS_HEADER_TABLE_SIZE = 0x01,
@@ -1753,10 +1754,9 @@ bool ConnectionImpl::Http2Visitor::OnBeginHeadersForStream(Http2StreamId stream_
   return 0 == connection_->setAndCheckCodecCallbackStatus(std::move(status));
 }
 
-http2::adapter::Http2VisitorInterface::OnHeaderResult
-ConnectionImpl::Http2Visitor::OnHeaderForStream(Http2StreamId stream_id,
-                                                absl::string_view name_view,
-                                                absl::string_view value_view) {
+OnHeaderResult ConnectionImpl::Http2Visitor::OnHeaderForStream(Http2StreamId stream_id,
+                                                               absl::string_view name_view,
+                                                               absl::string_view value_view) {
   // TODO PERF: Can reference count here to avoid copies.
   HeaderString name;
   name.setCopy(name_view.data(), name_view.size());
@@ -1765,11 +1765,11 @@ ConnectionImpl::Http2Visitor::OnHeaderForStream(Http2StreamId stream_id,
   const int result = connection_->onHeader(stream_id, std::move(name), std::move(value));
   switch (result) {
   case 0:
-    return HEADER_OK;
+    return OnHeaderResult::HEADER_OK;
   case ERR_TEMPORAL_CALLBACK_FAILURE:
-    return HEADER_RST_STREAM;
+    return OnHeaderResult::HEADER_RST_STREAM;
   default:
-    return HEADER_CONNECTION_ERROR;
+    return OnHeaderResult::HEADER_CONNECTION_ERROR;
   }
 }
 

diff --git a/test/common/quic/platform/quic_platform_test.cc b/test/common/quic/platform/quic_platform_test.cc
@@ -33,7 +33,6 @@
 #include "quiche/quic/platform/api/quic_flags.h"
 #include "quiche/quic/platform/api/quic_hostname_utils.h"
 #include "quiche/quic/platform/api/quic_logging.h"
-#include "quiche/quic/platform/api/quic_mutex.h"
 #include "quiche/quic/platform/api/quic_server_stats.h"
 #include "quiche/quic/platform/api/quic_stack_trace.h"
 #include "quiche/quic/platform/api/quic_test.h"
@@ -356,27 +355,6 @@ TEST_F(QuicPlatformTest, QuicNotReached) {
 #endif
 }
 
-TEST_F(QuicPlatformTest, QuicMutex) {
-  QuicMutex mu;
-
-  QuicWriterMutexLock wmu(&mu);
-  mu.AssertReaderHeld();
-  mu.WriterUnlock();
-  {
-    quiche::QuicheReaderMutexLock rmu(&mu);
-    mu.AssertReaderHeld();
-  }
-  mu.WriterLock();
-}
-
-TEST_F(QuicPlatformTest, QuicNotification) {
-  QuicNotification notification;
-  EXPECT_FALSE(notification.HasBeenNotified());
-  notification.Notify();
-  notification.WaitForNotification();
-  EXPECT_TRUE(notification.HasBeenNotified());
-}
-
 TEST_F(QuicPlatformTest, QuicTestOutput) {
   Envoy::TestEnvironment::setEnvVar("QUICHE_TEST_OUTPUT_DIR", "/tmp", /*overwrite=*/false);