Updates to incorporate QUICHE changes.

Signed-off-by: Biren Roy <birenroy@google.com>
envoyproxy · Feb 16, 2024 · d6d75f3 · d6d75f3
1 parent 0152831
commit d6d75f3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 20 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/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

diff --git a/test/common/quic/envoy_quic_h3_fuzz_helper.cc b/test/common/quic/envoy_quic_h3_fuzz_helper.cc
@@ -27,7 +27,7 @@ class Delegate : public quic::QpackEncoder::DecoderStreamErrorDelegate {
 
 static std::string encodeHeaders(const spdy::Http2HeaderBlock& headers) {
   static Delegate delegate;
-  quic::QpackEncoder encoder(&delegate);
+  quic::QpackEncoder encoder(&delegate, quic::HuffmanEncoding::kEnabled);
   return encoder.EncodeHeaderList(0, headers, nullptr);
 }
 

diff --git a/test/common/quic/platform/quiche_test_impl.h b/test/common/quic/platform/quiche_test_impl.h
@@ -40,5 +40,7 @@ inline std::string QuicheGetCommonSourcePathImpl() {
   return absl::StrCat(test_srcdir, "/external/com_github_google_quiche/quiche/common");
 }
 
+class QuicheScopedDisableExitOnDFatalImpl {};
+
 } // namespace test
 } // namespace quiche
diff --git a/test/common/quic/test_utils.h b/test/common/quic/test_utils.h
@@ -270,7 +270,8 @@ void setQuicConfigWithDefaultValues(quic::QuicConfig* config) {
 std::string spdyHeaderToHttp3StreamPayload(const spdy::Http2HeaderBlock& header) {
   quic::test::NoopQpackStreamSenderDelegate encoder_stream_sender_delegate;
   quic::NoopDecoderStreamErrorDelegate decoder_stream_error_delegate;
-  auto qpack_encoder = std::make_unique<quic::QpackEncoder>(&decoder_stream_error_delegate);
+  auto qpack_encoder = std::make_unique<quic::QpackEncoder>(&decoder_stream_error_delegate,
+                                                            quic::HuffmanEncoding::kEnabled);
   qpack_encoder->set_qpack_stream_sender_delegate(&encoder_stream_sender_delegate);
   // QpackEncoder does not use the dynamic table by default,
   // therefore the value of |stream_id| does not matter.