Quiche roll 20240205122544 (#32200)

* Update QUICHE from b5d556774 to 60a22a631 https://github.com/google/quiche/compare/b5d556774..60a22a631 ``` $ git log b5d556774..60a22a631 --date=short --no-merges --format="%ad %al %s" 2024-02-05 vasilvv No public description 2024-02-02 birenroy Demotes some noisy debug logging to VLOG. 2024-02-02 bnc Merge quic_protocol_flags_list.h into quiche_protocol_flags_list.h. 2024-02-02 martinduke MOQT Message formats from draft-02. ``` Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
envoyproxy · Feb 7, 2024 · 07a00cf · 07a00cf
1 parent eec5f50
commit 07a00cf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 21 deletions.
diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
@@ -2906,6 +2906,7 @@ envoy_quic_cc_library(
         ":quic_core_versions_lib",
         ":quic_platform_base",
         ":quiche_common_text_utils_lib",
+        ":quiche_common_wire_serialization",
         "@com_google_absl//absl/cleanup",
     ],
 )
@@ -2929,6 +2930,7 @@ envoy_cc_library(
         "quiche/quic/core/frames/quic_path_challenge_frame.cc",
         "quiche/quic/core/frames/quic_path_response_frame.cc",
         "quiche/quic/core/frames/quic_ping_frame.cc",
+        "quiche/quic/core/frames/quic_reset_stream_at_frame.cc",
         "quiche/quic/core/frames/quic_retire_connection_id_frame.cc",
         "quiche/quic/core/frames/quic_rst_stream_frame.cc",
         "quiche/quic/core/frames/quic_stop_sending_frame.cc",
@@ -2956,6 +2958,7 @@ envoy_cc_library(
         "quiche/quic/core/frames/quic_path_challenge_frame.h",
         "quiche/quic/core/frames/quic_path_response_frame.h",
         "quiche/quic/core/frames/quic_ping_frame.h",
+        "quiche/quic/core/frames/quic_reset_stream_at_frame.h",
         "quiche/quic/core/frames/quic_retire_connection_id_frame.h",
         "quiche/quic/core/frames/quic_rst_stream_frame.h",
         "quiche/quic/core/frames/quic_stop_sending_frame.h",
@@ -3571,15 +3574,6 @@ envoy_quic_cc_library(
     ],
 )
 
-envoy_cc_library(
-    name = "quic_core_protocol_flags_list_lib",
-    hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"],
-    copts = quiche_copts,
-    repository = "@envoy",
-    tags = ["nofips"],
-    visibility = ["//visibility:public"],
-)
-
 envoy_quic_cc_library(
     name = "quic_core_qpack_blocking_manager_lib",
     srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"],

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1175,12 +1175,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 = "b5d556774fb971506e5912a357f0f8fb8ef08d12",
-        sha256 = "f600af67bfccec4a0e8b88f721371756429975b1956269ae034ce08247ae55bd",
+        version = "60a22a631bdf944e26407d32a767b4aba953bc39",
+        sha256 = "70213d0e4016ce79db9f3dfc5e94b4e707c54b69e00fae7ea2593a08e9dfd11e",
         urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
         strip_prefix = "quiche-{version}",
         use_category = ["controlplane", "dataplane_core"],
-        release_date = "2024-02-01",
+        release_date = "2024-02-05",
         cpe = "N/A",
         license = "BSD-3-Clause",
         license_url = "https://github.com/google/quiche/blob/{version}/LICENSE",

diff --git a/source/common/quic/platform/BUILD b/source/common/quic/platform/BUILD
@@ -48,7 +48,6 @@ envoy_quiche_platform_impl_cc_library(
         "//source/common/common:assert_lib",
         "//source/common/http:utility_lib",
         "@com_github_google_quiche//:quic_core_flags_list_lib",
-        "@com_github_google_quiche//:quic_core_protocol_flags_list_lib",
         "@com_github_google_quiche//:quiche_protocol_flags_list_lib",
         "@com_google_absl//absl/flags:flag",
     ],

diff --git a/source/common/quic/platform/quiche_flags_impl.cc b/source/common/quic/platform/quiche_flags_impl.cc
@@ -80,10 +80,6 @@ template <> constexpr int32_t maybeOverride<int32_t>(absl::string_view name, int
 #define PROTOCOL_FLAG_MACRO_CHOOSER(...)                                                           \
   GET_6TH_ARG(__VA_ARGS__, DEFINE_PROTOCOL_FLAG_TWO_VALUES, DEFINE_PROTOCOL_FLAG_SINGLE_VALUE)
 
-#define QUIC_PROTOCOL_FLAG(...) PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
-#include "quiche/quic/core/quic_protocol_flags_list.h"
-#undef QUIC_PROTOCOL_FLAG
-
 #define QUICHE_PROTOCOL_FLAG(...) PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
 #include "quiche/common/quiche_protocol_flags_list.h"
 #undef QUICHE_PROTOCOL_FLAG

diff --git a/source/common/quic/platform/quiche_flags_impl.h b/source/common/quic/platform/quiche_flags_impl.h
@@ -49,10 +49,6 @@ class FlagRegistry {
 #include "quiche/quic/core/quic_flags_list.h"
 #undef QUIC_FLAG
 
-#define QUIC_PROTOCOL_FLAG(type, flag, ...) ABSL_DECLARE_FLAG(type, envoy_##flag);
-#include "quiche/quic/core/quic_protocol_flags_list.h"
-#undef QUIC_PROTOCOL_FLAG
-
 #define QUICHE_PROTOCOL_FLAG(type, flag, ...) ABSL_DECLARE_FLAG(type, envoy_##flag);
 #include "quiche/common/quiche_protocol_flags_list.h"
 #undef QUICHE_PROTOCOL_FLAG