Commit 71dfd2d3 authored by Victor Vasiliev's avatar Victor Vasiliev Committed by Commit Bot

This CL is a combination of two rolls.

Roll src/net/third_party/quiche/src/ dfbd3df88..fa63b6e14 (21 commits)

https://quiche.googlesource.com/quiche.git/+log/dfbd3df88865..fa63b6e147fd

$ git log dfbd3df88..fa63b6e14 --date=short --no-merges --format='%ad %ae %s'
2019-11-05 wub Fix a gfe_quic_fuzzer issue caused by uninitialized packet number.
2019-11-05 fayang gfe-relnote: In QUIC T049+, support sending coalesced packets.
2019-11-05 wub gfe-relnote: (n/a) Add QuicCircularDeque to third_party/quic/core. Code not used yet.
2019-11-05 bnc Remove QuicheMakeUnique.
2019-11-05 wub gfe-relnote: In quic_framer.cc, replace PacketNumberIntervalLength(interval) by interval.Length(). Not protected.
2019-11-05 wub Internal QUICHE change
2019-11-04 quiche-dev Add support for creating a persistent TUN device (that survives across Bonnet restarts).
2019-11-04 renjietang Change name of QuicStream::HasFinalReceivedByteOffset() to HasReiceivedFinalOffset().
2019-11-04 vasilvv Add a simple QuicTransport server for testing and demo purposes.
2019-11-04 fayang gfe-relnote: In QUIC, add a connection option to use 2 * rttvar when calculating PTO timeout. Protected by existing gfe2_reloadable_flag_quic_enable_pto.
2019-11-04 bnc Add QuicDispatcherPeer::GetTimeWaitListManager() method.
2019-11-04 fayang gfe-relnote: Deprecate gfe2_reloadable_flag_quic_donot_process_small_initial_packets.
2019-11-04 fayang gfe-relnote: Deprecate gfe2_reloadable_flag_quic_simplify_stop_waiting.
2019-11-04 fayang gfe-relnote: In QUIC, add SetSoftMaxPacketLength to set a soft max packet length in creator. If a single frame is failed to be serialized, restore the actual max packet length. Not used yet. Not protected.
2019-11-04 renjietang Use connection's encryption level at QuicCryptoStream::OnCryptoFrame().
2019-11-04 dschinazi Enable all versions in toy server
2019-11-04 dschinazi Deprecate quic_parse_prox_source_connection_id
2019-11-04 fayang gfe-relnote: Deprecate gfe2_reloadable_flag_quic_add_upper_limit_of_buffered_control_frames3.
2019-11-04 fayang gfe-relnote: In QUIC, add connection option to enable IETF loss detection with both adaptive packet and adaptive time threshold. Protected by existing gfe2_reloadable_flag_quic_enable_ietf_loss_detection.
2019-11-04 fayang gfe-relnote: In QUIC, add 2 connection options to set the start point of exponential backoff when calculating PTO timeout. Protected by exisiting gfe2_reloadable_flag_quic_enable_pto.
2019-11-04 fayang gfe-relnote: In GFE, add two QUIC connection options for cwnd bootstrap experiments with different multipliers. Protected by existing gfe2_reloadable_flag_quic_use_ip_bandwidth_module.

Created with:
  roll-dep src/net/third_party/quiche/src

Roll src/net/third_party/quiche/src/ fa63b6e14..7a4d20901 (7 commits)

https://quiche.googlesource.com/quiche.git/+log/fa63b6e147fd..7a4d20901fbb

$ git log fa63b6e14..7a4d20901 --date=short --no-merges --format='%ad %ae %s'
2019-11-06 quiche-dev Send an ICMP6_PACKET_TOO_BIG when we try to send a message that is too big.
2019-11-06 wub gfe-relnote: (n/a) Make QuicCircularDeque compile in Chromium. Code not used yet.
2019-11-06 vasilvv Replace kMaxIetfVarInt with UINT32_MAX, as size_t on 32-bit platforms is smaller than kMaxIetfVarInt, thus causing a compile error on those platforms.
2019-11-05 wub gfe-relnote: (n/a) Remove a QUIC_BUG in quic::PacketNumberQueue::AddRange. Test only. Not protected.
2019-11-05 renjietang Remove redundant stream finding code when STOP_SENDING frame is received.
2019-11-05 dschinazi Update to IETF draft 24
2019-11-05 fayang gfe-relnote: Remove QuicPacketGenerator.

Created with:
  roll-dep src/net/third_party/quiche/src

R=rch@chromium.org

Change-Id: I2ba2a6140544cd2f07f43b4fa68c36873c65e6d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900429
Commit-Queue: Victor Vasiliev <vasilvv@chromium.org>
Reviewed-by: default avatarSteve Anton <steveanton@chromium.org>
Reviewed-by: default avatarRyan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713313}
parent 36e8ad1e
...@@ -311,7 +311,7 @@ vars = { ...@@ -311,7 +311,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'quiche_revision': 'dfbd3df888652d8c9b8a945bcad16c5fbbaecc36', 'quiche_revision': '7a4d20901fbbf2cf46e84d363350608873f2594f',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit # the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -948,7 +948,6 @@ component("net") { ...@@ -948,7 +948,6 @@ component("net") {
"quic/quic_utils_chromium.cc", "quic/quic_utils_chromium.cc",
"quic/quic_utils_chromium.h", "quic/quic_utils_chromium.h",
"quiche/common/platform/impl/quiche_logging_impl.h", "quiche/common/platform/impl/quiche_logging_impl.h",
"quiche/common/platform/impl/quiche_ptr_util_impl.h",
"quiche/common/platform/impl/quiche_unordered_containers_impl.h", "quiche/common/platform/impl/quiche_unordered_containers_impl.h",
"socket/client_socket_factory.cc", "socket/client_socket_factory.cc",
"socket/client_socket_factory.h", "socket/client_socket_factory.h",
...@@ -1077,7 +1076,6 @@ component("net") { ...@@ -1077,7 +1076,6 @@ component("net") {
"ssl/threaded_ssl_private_key.cc", "ssl/threaded_ssl_private_key.cc",
"ssl/threaded_ssl_private_key.h", "ssl/threaded_ssl_private_key.h",
"third_party/quiche/src/common/platform/api/quiche_logging.h", "third_party/quiche/src/common/platform/api/quiche_logging.h",
"third_party/quiche/src/common/platform/api/quiche_ptr_util.h",
"third_party/quiche/src/common/platform/api/quiche_unordered_containers.h", "third_party/quiche/src/common/platform/api/quiche_unordered_containers.h",
"third_party/quiche/src/common/simple_linked_hash_map.h", "third_party/quiche/src/common/simple_linked_hash_map.h",
"third_party/quiche/src/http2/decoder/decode_buffer.cc", "third_party/quiche/src/http2/decoder/decode_buffer.cc",
...@@ -1464,8 +1462,6 @@ component("net") { ...@@ -1464,8 +1462,6 @@ component("net") {
"third_party/quiche/src/quic/core/quic_one_block_arena.h", "third_party/quiche/src/quic/core/quic_one_block_arena.h",
"third_party/quiche/src/quic/core/quic_packet_creator.cc", "third_party/quiche/src/quic/core/quic_packet_creator.cc",
"third_party/quiche/src/quic/core/quic_packet_creator.h", "third_party/quiche/src/quic/core/quic_packet_creator.h",
"third_party/quiche/src/quic/core/quic_packet_generator.cc",
"third_party/quiche/src/quic/core/quic_packet_generator.h",
"third_party/quiche/src/quic/core/quic_packet_number.cc", "third_party/quiche/src/quic/core/quic_packet_number.cc",
"third_party/quiche/src/quic/core/quic_packet_number.h", "third_party/quiche/src/quic/core/quic_packet_number.h",
"third_party/quiche/src/quic/core/quic_packet_writer.h", "third_party/quiche/src/quic/core/quic_packet_writer.h",
...@@ -3402,8 +3398,6 @@ source_set("quic_test_tools") { ...@@ -3402,8 +3398,6 @@ source_set("quic_test_tools") {
"third_party/quiche/src/quic/test_tools/quic_framer_peer.h", "third_party/quiche/src/quic/test_tools/quic_framer_peer.h",
"third_party/quiche/src/quic/test_tools/quic_packet_creator_peer.cc", "third_party/quiche/src/quic/test_tools/quic_packet_creator_peer.cc",
"third_party/quiche/src/quic/test_tools/quic_packet_creator_peer.h", "third_party/quiche/src/quic/test_tools/quic_packet_creator_peer.h",
"third_party/quiche/src/quic/test_tools/quic_packet_generator_peer.cc",
"third_party/quiche/src/quic/test_tools/quic_packet_generator_peer.h",
"third_party/quiche/src/quic/test_tools/quic_sent_packet_manager_peer.cc", "third_party/quiche/src/quic/test_tools/quic_sent_packet_manager_peer.cc",
"third_party/quiche/src/quic/test_tools/quic_sent_packet_manager_peer.h", "third_party/quiche/src/quic/test_tools/quic_sent_packet_manager_peer.h",
"third_party/quiche/src/quic/test_tools/quic_server_session_base_peer.h", "third_party/quiche/src/quic/test_tools/quic_server_session_base_peer.h",
...@@ -3552,6 +3546,10 @@ source_set("simple_quic_tools") { ...@@ -3552,6 +3546,10 @@ source_set("simple_quic_tools") {
"third_party/quiche/src/quic/tools/quic_spdy_client_base.cc", "third_party/quiche/src/quic/tools/quic_spdy_client_base.cc",
"third_party/quiche/src/quic/tools/quic_spdy_client_base.h", "third_party/quiche/src/quic/tools/quic_spdy_client_base.h",
"third_party/quiche/src/quic/tools/quic_spdy_server_base.h", "third_party/quiche/src/quic/tools/quic_spdy_server_base.h",
"third_party/quiche/src/quic/tools/quic_transport_simple_server_dispatcher.cc",
"third_party/quiche/src/quic/tools/quic_transport_simple_server_dispatcher.h",
"third_party/quiche/src/quic/tools/quic_transport_simple_server_session.cc",
"third_party/quiche/src/quic/tools/quic_transport_simple_server_session.h",
"third_party/quiche/src/quic/tools/quic_url.cc", "third_party/quiche/src/quic/tools/quic_url.cc",
"third_party/quiche/src/quic/tools/quic_url.h", "third_party/quiche/src/quic/tools/quic_url.h",
"tools/quic/quic_client_message_loop_network_helper.cc", "tools/quic/quic_client_message_loop_network_helper.cc",
...@@ -5517,7 +5515,6 @@ test("net_unittests") { ...@@ -5517,7 +5515,6 @@ test("net_unittests") {
"third_party/quiche/src/quic/core/quic_lru_cache_test.cc", "third_party/quiche/src/quic/core/quic_lru_cache_test.cc",
"third_party/quiche/src/quic/core/quic_one_block_arena_test.cc", "third_party/quiche/src/quic/core/quic_one_block_arena_test.cc",
"third_party/quiche/src/quic/core/quic_packet_creator_test.cc", "third_party/quiche/src/quic/core/quic_packet_creator_test.cc",
"third_party/quiche/src/quic/core/quic_packet_generator_test.cc",
"third_party/quiche/src/quic/core/quic_packet_number_test.cc", "third_party/quiche/src/quic/core/quic_packet_number_test.cc",
"third_party/quiche/src/quic/core/quic_packets_test.cc", "third_party/quiche/src/quic/core/quic_packets_test.cc",
"third_party/quiche/src/quic/core/quic_received_packet_manager_test.cc", "third_party/quiche/src/quic/core/quic_received_packet_manager_test.cc",
...@@ -5838,7 +5835,8 @@ test("net_unittests") { ...@@ -5838,7 +5835,8 @@ test("net_unittests") {
"quic/platform/impl/quic_socket_utils_test.cc", "quic/platform/impl/quic_socket_utils_test.cc",
"third_party/quiche/src/epoll_server/simple_epoll_server_test.cc", "third_party/quiche/src/epoll_server/simple_epoll_server_test.cc",
"third_party/quiche/src/quic/core/chlo_extractor_test.cc", "third_party/quiche/src/quic/core/chlo_extractor_test.cc",
"third_party/quiche/src/quic/core/http/end_to_end_test.cc",
#"third_party/quiche/src/quic/core/http/end_to_end_test.cc",
"third_party/quiche/src/quic/core/http/quic_spdy_client_session_test.cc", "third_party/quiche/src/quic/core/http/quic_spdy_client_session_test.cc",
"third_party/quiche/src/quic/core/http/quic_spdy_client_stream_test.cc", "third_party/quiche/src/quic/core/http/quic_spdy_client_stream_test.cc",
"third_party/quiche/src/quic/core/http/quic_spdy_server_stream_base_test.cc", "third_party/quiche/src/quic/core/http/quic_spdy_server_stream_base_test.cc",
......
...@@ -370,3 +370,9 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_fix_pacing_rate, false) ...@@ -370,3 +370,9 @@ QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_bbr_fix_pacing_rate, false)
// The maximum congestion window in packets. // The maximum congestion window in packets.
QUIC_FLAG(int32_t, FLAGS_quic_max_congestion_window, 2000) QUIC_FLAG(int32_t, FLAGS_quic_max_congestion_window, 2000)
// If true, QuicCryptoStream::OnCryptoFrame() will never use the frame's
// encryption level.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_use_connection_encryption_level,
false)
// Copyright (c) 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef NET_QUICHE_COMMON_PLATFORM_IMPL_QUICHE_PTR_UTIL_IMPL_H_
#define NET_QUICHE_COMMON_PLATFORM_IMPL_QUICHE_PTR_UTIL_IMPL_H_
#include <memory>
namespace quiche {
template <typename T, typename... Args>
std::unique_ptr<T> QuicheMakeUniqueImpl(Args&&... args) {
return std::make_unique<T>(std::forward<Args>(args)...);
}
} // namespace quiche
#endif // NET_QUICHE_COMMON_PLATFORM_IMPL_QUICHE_PTR_UTIL_IMPL_H_
...@@ -77,7 +77,8 @@ class P2PQuicPacketWriter : public quic::QuicPacketWriter, ...@@ -77,7 +77,8 @@ class P2PQuicPacketWriter : public quic::QuicPacketWriter,
} }
P2PQuicPacketTransport::QuicPacket packet; P2PQuicPacketTransport::QuicPacket packet;
packet.packet_number = connection_->packet_generator().packet_number().ToUint64(); packet.packet_number =
connection_->packet_creator().packet_number().ToUint64();
packet.buffer = buffer; packet.buffer = buffer;
packet.buf_len = buf_len; packet.buf_len = buf_len;
int bytes_written = packet_transport_->WritePacket(packet); int bytes_written = packet_transport_->WritePacket(packet);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment