Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 12 additions & 28 deletions bazel/external/quiche.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ envoy_cc_library(
deps = [
":quic_platform_export",
":quiche_common_lib",
":quiche_common_platform_default_quiche_platform_impl_export_lib",
"@envoy//source/common/quic/platform:quic_platform_base_impl_lib",
],
)
Expand Down Expand Up @@ -1155,7 +1156,10 @@ envoy_cc_test_library(
hdrs = ["quiche/quic/platform/api/quic_test.h"],
repository = "@envoy",
tags = ["nofips"],
deps = ["@envoy//test/common/quic/platform:quic_platform_test_impl_lib"],
deps = [
":quiche_common_platform_test",
"@envoy//test/common/quic/platform:quic_platform_test_impl_lib",
],
)

envoy_cc_test_library(
Expand Down Expand Up @@ -2272,7 +2276,6 @@ envoy_cc_library(
":quic_core_types_lib",
":quic_core_versions_lib",
":quic_platform_base",
":quic_platform_mem_slice_span",
],
)

Expand Down Expand Up @@ -3281,7 +3284,6 @@ envoy_cc_library(
":quic_core_utils_lib",
":quic_core_versions_lib",
":quic_platform",
":quic_platform_mem_slice_span",
":quiche_common_text_utils_lib",
":spdy_core_protocol_lib",
],
Expand Down Expand Up @@ -3335,7 +3337,6 @@ envoy_cc_library(
":quic_core_types_lib",
":quic_core_utils_lib",
":quic_platform_base",
":quic_platform_mem_slice_span",
":quiche_common_circular_deque_lib",
],
)
Expand Down Expand Up @@ -4009,6 +4010,7 @@ envoy_cc_library(
envoy_cc_library(
name = "quiche_common_platform_default_quiche_platform_impl_export_lib",
hdrs = [
"quiche/common/platform/default/quiche_platform_impl/quiche_containers_impl.h",
"quiche/common/platform/default/quiche_platform_impl/quiche_export_impl.h",
"quiche/common/platform/default/quiche_platform_impl/quiche_thread_local_impl.h",
],
Expand Down Expand Up @@ -4163,32 +4165,17 @@ envoy_cc_test(
],
)

envoy_cc_library(
name = "quic_platform_mem_slice_span",
hdrs = [
"quiche/quic/platform/api/quic_mem_slice_span.h",
],
copts = quiche_copts,
repository = "@envoy",
tags = ["nofips"],
visibility = ["//visibility:public"],
deps = ["@envoy//source/common/quic/platform:quic_platform_mem_slice_span_impl_lib"],
)

envoy_cc_test_library(
name = "quic_platform_test_mem_slice_vector_lib",
hdrs = ["quiche/quic/platform/api/quic_test_mem_slice_vector.h"],
repository = "@envoy",
tags = ["nofips"],
deps = ["@envoy//test/common/quic/platform:quic_platform_test_mem_slice_vector_impl_lib"],
)

envoy_cc_library(
name = "quic_platform_mem_slice_storage",
srcs = ["quiche/quic/platform/api/quic_mem_slice_storage.cc"],
hdrs = ["quiche/quic/platform/api/quic_mem_slice_storage.h"],
repository = "@envoy",
visibility = ["//visibility:public"],
deps = ["@envoy//source/common/quic/platform:quic_platform_mem_slice_storage_impl_lib"],
deps = [
":quic_core_types_lib",
":quic_core_utils_lib",
":quic_platform_base",
],
)

envoy_cc_test(
Expand All @@ -4207,7 +4194,6 @@ envoy_cc_test(
envoy_cc_test(
name = "quic_platform_api_test",
srcs = [
"quiche/quic/platform/api/quic_mem_slice_span_test.cc",
"quiche/quic/platform/api/quic_mem_slice_storage_test.cc",
"quiche/quic/platform/api/quic_mem_slice_test.cc",
"quiche/quic/platform/api/quic_reference_counted_test.cc",
Expand All @@ -4218,10 +4204,8 @@ envoy_cc_test(
deps = [
":quic_core_buffer_allocator_lib",
":quic_platform",
":quic_platform_mem_slice_span",
":quic_platform_mem_slice_storage",
":quic_platform_test",
":quic_platform_test_mem_slice_vector_lib",
],
)

Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -821,13 +821,13 @@ 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 = "29fb6fc501e4df5874129408b5474a91eaa9b7a0",
sha256 = "bcc17653958c622e475deacbf23e9a215cdb711688671110e20192500ba210dc",
version = "8d5eb27ee2e3f009f7180e8ace0ff97830d9c3e9",
sha256 = "88cc71556b96bbec953a716a12c26f88b8af4d5e9a83cf3ec38aba4caed6bf52",
# Static snapshot of https://quiche.googlesource.com/quiche/+archive/{version}.tar.gz
urls = ["https://github.com/google/quiche/archive/{version}.tar.gz"],
strip_prefix = "quiche-{version}",
use_category = ["dataplane_core"],
release_date = "2021-08-06",
release_date = "2021-08-31",
cpe = "N/A",
),
com_googlesource_googleurl = dict(
Expand Down
1 change: 1 addition & 0 deletions docs/root/version_history/current.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Minor Behavior Changes
Windows has been disabled due to suboptimal behavior. See the field documentation for more
information.
* listener: destroy per network filter chain stats when a network filter chain is removed during the listener in place update.
* quic: enables IETF connection migration. This feature requires stable UDP packet routine in the L4 load balancer with the same first-4-bytes in connection id. It can be turned off by setting runtime guard ``envoy.reloadable_features.FLAGS_quic_reloadable_flag_quic_connection_migration_use_new_cid_v2`` to false.

Bug Fixes
---------
Expand Down
2 changes: 0 additions & 2 deletions source/common/quic/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ envoy_cc_library(
"//source/common/buffer:buffer_lib",
"//source/common/common:assert_lib",
"//source/common/http:header_map_lib",
"//source/common/quic/platform:quic_platform_mem_slice_storage_impl_lib",
"@com_github_google_quiche//:quic_core_http_spdy_session_lib",
],
)
Expand Down Expand Up @@ -271,7 +270,6 @@ envoy_cc_library(
"//source/common/http:codes_lib",
"//source/common/http:header_map_lib",
"//source/common/http:header_utility_lib",
"//source/common/quic/platform:quic_platform_mem_slice_storage_impl_lib",
"@com_github_google_quiche//:quic_core_http_client_lib",
],
)
Expand Down
15 changes: 13 additions & 2 deletions source/common/quic/envoy_quic_client_stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "quiche/quic/core/quic_session.h"
#include "quiche/quic/core/http/quic_header_list.h"
#include "quiche/spdy/core/spdy_header_block.h"
#include "source/common/quic/platform/quic_mem_slice_span_impl.h"

#if defined(__GNUC__)
#pragma GCC diagnostic pop
Expand Down Expand Up @@ -81,8 +80,20 @@ void EnvoyQuicClientStream::encodeData(Buffer::Instance& data, bool end_stream)
ASSERT(!local_end_stream_);
local_end_stream_ = end_stream;
SendBufferMonitor::ScopedWatermarkBufferUpdater updater(this, this);
Buffer::RawSliceVector raw_slices = data.getRawSlices();
absl::InlinedVector<quic::QuicMemSlice, 4> quic_slices;
quic_slices.reserve(raw_slices.size());
for (auto& slice : raw_slices) {
ASSERT(slice.len_ != 0);
// Move each slice into a stand-alone buffer.
// TODO(danzh): investigate the cost of allocating one buffer per slice.
// If it turns out to be expensive, add a new function to free data in the middle in buffer
// interface and re-design QuicMemSliceImpl.
quic_slices.emplace_back(quic::QuicMemSliceImpl(data, slice.len_));
}
absl::Span<quic::QuicMemSlice> span(quic_slices);
// QUIC stream must take all.
WriteBodySlices(quic::QuicMemSliceSpan(quic::QuicMemSliceSpanImpl(data)), end_stream);
WriteBodySlices(span, end_stream);
if (data.length() > 0) {
// Send buffer didn't take all the data, threshold needs to be adjusted.
Reset(quic::QUIC_BAD_APPLICATION_PAYLOAD);
Expand Down
15 changes: 13 additions & 2 deletions source/common/quic/envoy_quic_server_stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "quiche/quic/core/http/quic_header_list.h"
#include "quiche/quic/core/quic_session.h"
#include "quiche/spdy/core/spdy_header_block.h"
#include "source/common/quic/platform/quic_mem_slice_span_impl.h"

#if defined(__GNUC__)
#pragma GCC diagnostic pop
Expand Down Expand Up @@ -74,8 +73,20 @@ void EnvoyQuicServerStream::encodeData(Buffer::Instance& data, bool end_stream)
ASSERT(!local_end_stream_);
local_end_stream_ = end_stream;
SendBufferMonitor::ScopedWatermarkBufferUpdater updater(this, this);
Buffer::RawSliceVector raw_slices = data.getRawSlices();
absl::InlinedVector<quic::QuicMemSlice, 4> quic_slices;
quic_slices.reserve(raw_slices.size());
for (auto& slice : raw_slices) {
ASSERT(slice.len_ != 0);
// Move each slice into a stand-alone buffer.
// TODO(danzh): investigate the cost of allocating one buffer per slice.
// If it turns out to be expensive, add a new function to free data in the middle in buffer
// interface and re-design QuicMemSliceImpl.
quic_slices.emplace_back(quic::QuicMemSliceImpl(data, slice.len_));
}
absl::Span<quic::QuicMemSlice> span(quic_slices);
// QUIC stream must take all.
WriteBodySlices(quic::QuicMemSliceSpan(quic::QuicMemSliceSpanImpl(data)), end_stream);
WriteBodySlices(span, end_stream);
if (data.length() > 0) {
// Send buffer didn't take all the data, threshold needs to be adjusted.
Reset(quic::QUIC_BAD_APPLICATION_PAYLOAD);
Expand Down
37 changes: 0 additions & 37 deletions source/common/quic/platform/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -175,43 +175,6 @@ envoy_cc_library(
],
)

envoy_cc_library(
name = "quic_platform_mem_slice_span_impl_lib",
srcs = ["quic_mem_slice_span_impl.cc"],
hdrs = ["quic_mem_slice_span_impl.h"],
copts = select({
"//bazel:windows_x86_64": [],
"//conditions:default": ["-Wno-unused-parameter"],
}),
tags = ["nofips"],
visibility = ["//visibility:public"],
deps = [
"//envoy/buffer:buffer_interface",
"@com_github_google_quiche//:quic_core_types_lib",
"@com_github_google_quiche//:quic_platform_base",
],
)

envoy_cc_library(
name = "quic_platform_mem_slice_storage_impl_lib",
srcs = ["quic_mem_slice_storage_impl.cc"],
hdrs = ["quic_mem_slice_storage_impl.h"],
copts = select({
"//bazel:windows_x86_64": [],
"//conditions:default": [
"-Wno-error=invalid-offsetof",
"-Wno-unused-parameter",
],
}),
tags = ["nofips"],
visibility = ["//visibility:public"],
deps = [
"@com_github_google_quiche//:quic_core_buffer_allocator_lib",
"@com_github_google_quiche//:quic_core_utils_lib",
"@com_github_google_quiche//:quic_platform_mem_slice_span",
],
)

envoy_cc_library(
name = "quic_platform_udp_socket_impl_lib",
hdrs = select({
Expand Down
20 changes: 0 additions & 20 deletions source/common/quic/platform/quic_mem_slice_span_impl.cc

This file was deleted.

94 changes: 0 additions & 94 deletions source/common/quic/platform/quic_mem_slice_span_impl.h

This file was deleted.

Loading