Update QUICHE from db26d87d8 to 59fe4b0f4 (#38321)

Update QUICHE from db26d87d8 to 59fe4b0f4 https://github.com/google/quiche/compare/db26d87d8..59fe4b0f4 ``` $ git log db26d87d8..59fe4b0f4 --date=short --no-merges --format="%ad %al %s" 2025-02-05 birenroy Fixes a stream close condition in OgHttp2Session::CloseStreamIfReady. 2025-02-05 birenroy Adds a unit test to compare the client adapter implementations when cancelling a stream. 2025-02-04 martinduke Store a QuicAlarmFactory in MoqtSession. 2025-02-04 wub Deprecate --gfe2_reloadable_flag_quic_buffered_store_set_client_cid. 2025-02-03 abhisinghx Move QUIC Socket Address lib to QUICHE. Patch envoy to use QuicheSocketAddress instead 2025-02-03 haoyuewang Log more detailed info when dumping GfeQuicClientStream. ``` --------- Signed-off-by: Biren Roy <birenroy@google.com>
envoyproxy · Feb 6, 2025 · a49bf67 · a49bf67
1 parent 916594d
commit a49bf67
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
@@ -1,3 +1,4 @@
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load(
     "@envoy//bazel:envoy_build_system.bzl",
     "envoy_cc_library",
@@ -216,6 +217,7 @@ envoy_cc_test(
         ":http2_adapter_mock_http2_visitor",
         ":http2_adapter_recording_http2_visitor",
         ":http2_adapter_test_frame_sequence",
+        ":http2_adapter_test_utils",
         ":quiche_common_platform_test",
     ],
 )
@@ -1681,16 +1683,29 @@ envoy_cc_library(
     deps = [":quiche_common_platform_udp_socket_platform"],
 )
 
+envoy_cc_library(
+    name = "quiche_common_socket_address",
+    srcs = ["quiche/common/quiche_socket_address.cc"],
+    hdrs = ["quiche/common/quiche_socket_address.h"],
+    copts = quiche_copts,
+    repository = "@envoy",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":quic_platform_export",
+        ":quic_platform_ip_address",
+    ],
+)
+
 envoy_cc_library(
     name = "quic_platform_socket_address",
-    srcs = ["quiche/quic/platform/api/quic_socket_address.cc"],
     hdrs = ["quiche/quic/platform/api/quic_socket_address.h"],
     copts = quiche_copts,
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
         ":quic_platform_export",
         ":quic_platform_ip_address",
+        ":quiche_common_socket_address",
     ],
 )
 

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1218,12 +1218,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 = "db26d87d8a81d63cebbd9414982f1115b2a348c0",
-        sha256 = "b67d79b1d483f19b8374ca8a7621b4deb9689d70123fd5707438d89056900a7d",
+        version = "59fe4b0f46afd59dd212bb01a175f8b8b5662fe4",
+        sha256 = "75d2ff0cf54ad724a36a38f984d0b258ff82bc02d599ac2fd499e836b3fd3880",
         urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
         strip_prefix = "quiche-{version}",
         use_category = ["controlplane", "dataplane_core"],
-        release_date = "2025-02-03",
+        release_date = "2025-02-05",
         cpe = "N/A",
         license = "BSD-3-Clause",
         license_url = "https://github.com/google/quiche/blob/{version}/LICENSE",

diff --git a/envoy/network/filter.h b/envoy/network/filter.h
@@ -12,8 +12,11 @@
 
 #include "source/common/protobuf/protobuf.h"
 
+namespace quiche {
+class QuicheSocketAddress;
+} // namespace quiche
+
 namespace quic {
-class QuicSocketAddress;
 class QuicReceivedPacket;
 } // namespace quic
 
@@ -450,7 +453,7 @@ class QuicListenerFilter {
    * if the connection socket's destination address were the preferred address.
    */
   virtual bool isCompatibleWithServerPreferredAddress(
-      const quic::QuicSocketAddress& server_preferred_address) const PURE;
+      const quiche::QuicheSocketAddress& server_preferred_address) const PURE;
 
   /**
    * Called after the peer has migrated to a different address. Check if the connection
@@ -464,7 +467,7 @@ class QuicListenerFilter {
    * @param connection the connection just migrated.
    * @return status used by the filter manager to manage further filter iteration.
    */
-  virtual FilterStatus onPeerAddressChanged(const quic::QuicSocketAddress& new_address,
+  virtual FilterStatus onPeerAddressChanged(const quiche::QuicheSocketAddress& new_address,
                                             Connection& connection) PURE;
 
   /**
@@ -494,9 +497,9 @@ class QuicListenerFilterManager {
                          QuicListenerFilterPtr&& filter) PURE;
 
   virtual bool shouldAdvertiseServerPreferredAddress(
-      const quic::QuicSocketAddress& server_preferred_address) const PURE;
+      const quiche::QuicheSocketAddress& server_preferred_address) const PURE;
 
-  virtual void onPeerAddressChanged(const quic::QuicSocketAddress& new_address,
+  virtual void onPeerAddressChanged(const quiche::QuicheSocketAddress& new_address,
                                     Connection& connection) PURE;
   virtual void onFirstPacketReceived(const quic::QuicReceivedPacket&) PURE;
 };

diff --git a/source/extensions/quic/server_preferred_address/server_preferred_address.h b/source/extensions/quic/server_preferred_address/server_preferred_address.h
@@ -8,8 +8,8 @@ namespace Quic {
 class ServerPreferredAddressConfig : public Quic::EnvoyQuicServerPreferredAddressConfig {
 public:
   struct IpVersionConfig {
-    quic::QuicSocketAddress spa_;
-    quic::QuicIpAddress dnat_;
+    quiche::QuicheSocketAddress spa_;
+    quiche::QuicheIpAddress dnat_;
   };
 
   ServerPreferredAddressConfig(const IpVersionConfig& v4, const IpVersionConfig& v6)