Commit 226721a6 authored by Fan Yang's avatar Fan Yang Committed by Commit Bot

Roll src/net/third_party/quiche/src/ 84639a15f..7379c4932 (8 commits)

https://quiche.googlesource.com/quiche.git/+log/84639a15fe70..7379c493206b

$ git log 84639a15f..7379c4932 --date=short --no-merges --format='%ad %ae %s'
2020-03-24 fayang Stop running third_party/quic/core/http:end_to_end_test with PCC and different priority tags.
2020-03-24 bnc gfe-relnote: Refactor SetMaxAllowedPushId() method, add DCHECKs.  Not protected.
2020-03-23 renjietang Send Goaway after receiving too large stream count in QuicStreamsBlocked frame.
2020-03-23 renjietang Move QuicDataReader::ReadVarIntU32 to QuicFramer for more detailed framer errors.
2020-03-23 wub Internal QUICHE change
2020-03-23 fayang gfe-relnote: In QUIC, use QuicNetworkBlackholeDetector which detects both path degrading and network blackhole. Protected by gfe2_reloadable_flag_quic_use_blackhole_detector.
2020-03-23 vasilvv Record encryption level for ACK and LOSS events in QUIC traces.
2020-03-23 bnc Remove unnecessary QuicSpdySession::SetMaxAllowedPushId() calls in tests that are not run with IETF QUIC versions.

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

Change-Id: Ia916e3ae03293a7b06818d546edb40dc2a041bff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2120276Reviewed-by: default avatarBence Béky <bnc@chromium.org>
Commit-Queue: Fan Yang <fayang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753293}
parent 505cd97f
...@@ -306,7 +306,7 @@ vars = { ...@@ -306,7 +306,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': '84639a15fe700eedd3b158837c7e7e42338833f2', 'quiche_revision': '7379c493206bd0fb646cbaaa86b03617bb2fbbd9',
# 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.
......
...@@ -968,7 +968,9 @@ QuicChromiumClientSession::~QuicChromiumClientSession() { ...@@ -968,7 +968,9 @@ QuicChromiumClientSession::~QuicChromiumClientSession() {
} }
void QuicChromiumClientSession::Initialize() { void QuicChromiumClientSession::Initialize() {
quic::QuicSpdyClientSessionBase::SetMaxAllowedPushId(max_allowed_push_id_); if (VersionUsesHttp3(transport_version())) {
quic::QuicSpdyClientSessionBase::SetMaxPushId(max_allowed_push_id_);
}
set_max_inbound_header_list_size(kQuicMaxHeaderListSize); set_max_inbound_header_list_size(kQuicMaxHeaderListSize);
quic::QuicSpdyClientSessionBase::Initialize(); quic::QuicSpdyClientSessionBase::Initialize();
SetHpackEncoderDebugVisitor(std::make_unique<HpackEncoderDebugVisitor>()); SetHpackEncoderDebugVisitor(std::make_unique<HpackEncoderDebugVisitor>());
......
...@@ -645,6 +645,7 @@ void QuicConnectionLogger::OnPacketSent( ...@@ -645,6 +645,7 @@ void QuicConnectionLogger::OnPacketSent(
void QuicConnectionLogger::OnPacketLoss( void QuicConnectionLogger::OnPacketLoss(
quic::QuicPacketNumber lost_packet_number, quic::QuicPacketNumber lost_packet_number,
quic::EncryptionLevel /*encryption_level*/,
quic::TransmissionType transmission_type, quic::TransmissionType transmission_type,
quic::QuicTime detection_time) { quic::QuicTime detection_time) {
if (!net_log_.IsCapturing()) if (!net_log_.IsCapturing())
...@@ -828,6 +829,7 @@ void QuicConnectionLogger::OnMaxStreamsFrame( ...@@ -828,6 +829,7 @@ void QuicConnectionLogger::OnMaxStreamsFrame(
void QuicConnectionLogger::OnIncomingAck( void QuicConnectionLogger::OnIncomingAck(
quic::QuicPacketNumber ack_packet_number, quic::QuicPacketNumber ack_packet_number,
quic::EncryptionLevel /*ack_decrypted_level*/,
const quic::QuicAckFrame& frame, const quic::QuicAckFrame& frame,
quic::QuicTime ack_receive_time, quic::QuicTime ack_receive_time,
quic::QuicPacketNumber largest_observed, quic::QuicPacketNumber largest_observed,
......
...@@ -50,12 +50,14 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger ...@@ -50,12 +50,14 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger
quic::TransmissionType transmission_type, quic::TransmissionType transmission_type,
quic::QuicTime sent_time) override; quic::QuicTime sent_time) override;
void OnIncomingAck(quic::QuicPacketNumber ack_packet_number, void OnIncomingAck(quic::QuicPacketNumber ack_packet_number,
quic::EncryptionLevel ack_decrypted_level,
const quic::QuicAckFrame& frame, const quic::QuicAckFrame& frame,
quic::QuicTime ack_receive_time, quic::QuicTime ack_receive_time,
quic::QuicPacketNumber largest_observed, quic::QuicPacketNumber largest_observed,
bool rtt_updated, bool rtt_updated,
quic::QuicPacketNumber least_unacked_sent_packet) override; quic::QuicPacketNumber least_unacked_sent_packet) override;
void OnPacketLoss(quic::QuicPacketNumber lost_packet_number, void OnPacketLoss(quic::QuicPacketNumber lost_packet_number,
quic::EncryptionLevel encryption_level,
quic::TransmissionType transmission_type, quic::TransmissionType transmission_type,
quic::QuicTime detection_time) override; quic::QuicTime detection_time) override;
void OnPingSent() override; void OnPingSent() override;
......
...@@ -392,3 +392,7 @@ QUIC_FLAG( ...@@ -392,3 +392,7 @@ QUIC_FLAG(
QUIC_FLAG(bool, QUIC_FLAG(bool,
FLAGS_quic_restart_flag_quic_send_settings_on_write_key_available, FLAGS_quic_restart_flag_quic_send_settings_on_write_key_available,
false) false)
// If true, use blackhole detector in QuicConnection to detect path degrading
// and network blackhole.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_use_blackhole_detector, false)
...@@ -434,6 +434,8 @@ source_set("quiche") { ...@@ -434,6 +434,8 @@ source_set("quiche") {
"src/quic/core/quic_lru_cache.h", "src/quic/core/quic_lru_cache.h",
"src/quic/core/quic_mtu_discovery.cc", "src/quic/core/quic_mtu_discovery.cc",
"src/quic/core/quic_mtu_discovery.h", "src/quic/core/quic_mtu_discovery.h",
"src/quic/core/quic_network_blackhole_detector.cc",
"src/quic/core/quic_network_blackhole_detector.h",
"src/quic/core/quic_one_block_arena.h", "src/quic/core/quic_one_block_arena.h",
"src/quic/core/quic_packet_creator.cc", "src/quic/core/quic_packet_creator.cc",
"src/quic/core/quic_packet_creator.h", "src/quic/core/quic_packet_creator.h",
...@@ -1317,6 +1319,7 @@ source_set("quiche_tests") { ...@@ -1317,6 +1319,7 @@ source_set("quiche_tests") {
"src/quic/core/quic_interval_set_test.cc", "src/quic/core/quic_interval_set_test.cc",
"src/quic/core/quic_interval_test.cc", "src/quic/core/quic_interval_test.cc",
"src/quic/core/quic_lru_cache_test.cc", "src/quic/core/quic_lru_cache_test.cc",
"src/quic/core/quic_network_blackhole_detector_test.cc",
"src/quic/core/quic_one_block_arena_test.cc", "src/quic/core/quic_one_block_arena_test.cc",
"src/quic/core/quic_packet_creator_test.cc", "src/quic/core/quic_packet_creator_test.cc",
"src/quic/core/quic_packet_number_test.cc", "src/quic/core/quic_packet_number_test.cc",
......
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