Commit 3e347f41 authored by Dan Zhang's avatar Dan Zhang Committed by Commit Bot

Roll src/net/third_party/quiche/src/ 2c4978fa8..d2bf0ba74 (4 commits)

https://quiche.googlesource.com/quiche.git/+log/2c4978fa890c..d2bf0ba74c74

$ git log 2c4978fa8..d2bf0ba74 --date=short --no-merges --format='%ad %ae %s'
2020-08-14 fayang Log ping_received_delay in transport_connection_stats. Logging only, not protected.
2020-08-13 renjietang Do not send out MAX_PUSH_ID frame if the client sets max_push_id to 0(default value).
2020-08-13 fayang Add has_ack to QuicTransmissionInfo. Currently, only used for logging purpose, not protected.
2020-08-13 wub Internal QUICHE change

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

OnPingFrame interface change

R=dschinazi@chromium.org

Change-Id: Idc7ec023e867d62957826dc3036fbd07e2549a5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354165
Commit-Queue: Dan Zhang <danzh@chromium.org>
Commit-Queue: David Schinazi <dschinazi@chromium.org>
Auto-Submit: Dan Zhang <danzh@chromium.org>
Reviewed-by: default avatarDavid Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798374}
parent 91625a06
...@@ -322,7 +322,7 @@ vars = { ...@@ -322,7 +322,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': '2c4978fa890c4d02b7c453284d23255b22d1191b', 'quiche_revision': 'd2bf0ba74c742056b9f982d35fccff77cabb4c59',
# 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.
......
...@@ -430,8 +430,10 @@ void QuicConnectionLogger::OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) { ...@@ -430,8 +430,10 @@ void QuicConnectionLogger::OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) {
event_logger_.OnGoAwayFrame(frame); event_logger_.OnGoAwayFrame(frame);
} }
void QuicConnectionLogger::OnPingFrame(const quic::QuicPingFrame& frame) { void QuicConnectionLogger::OnPingFrame(
event_logger_.OnPingFrame(frame); const quic::QuicPingFrame& frame,
quic::QuicTime::Delta ping_received_delay) {
event_logger_.OnPingFrame(frame, ping_received_delay);
} }
void QuicConnectionLogger::OnPaddingFrame(const quic::QuicPaddingFrame& frame) { void QuicConnectionLogger::OnPaddingFrame(const quic::QuicPaddingFrame& frame) {
......
...@@ -90,7 +90,8 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger ...@@ -90,7 +90,8 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger
const quic::QuicTime& receive_time) override; const quic::QuicTime& receive_time) override;
void OnBlockedFrame(const quic::QuicBlockedFrame& frame) override; void OnBlockedFrame(const quic::QuicBlockedFrame& frame) override;
void OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) override; void OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) override;
void OnPingFrame(const quic::QuicPingFrame& frame) override; void OnPingFrame(const quic::QuicPingFrame& frame,
quic::QuicTime::Delta ping_received_delay) override;
void OnPaddingFrame(const quic::QuicPaddingFrame& frame) override; void OnPaddingFrame(const quic::QuicPaddingFrame& frame) override;
void OnNewConnectionIdFrame( void OnNewConnectionIdFrame(
const quic::QuicNewConnectionIdFrame& frame) override; const quic::QuicNewConnectionIdFrame& frame) override;
......
...@@ -691,7 +691,9 @@ void QuicEventLogger::OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) { ...@@ -691,7 +691,9 @@ void QuicEventLogger::OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) {
[&] { return NetLogQuicGoAwayFrameParams(&frame); }); [&] { return NetLogQuicGoAwayFrameParams(&frame); });
} }
void QuicEventLogger::OnPingFrame(const quic::QuicPingFrame& frame) { void QuicEventLogger::OnPingFrame(
const quic::QuicPingFrame& frame,
quic::QuicTime::Delta /*ping_received_delay*/) {
// PingFrame has no contents to log, so just record that it was received. // PingFrame has no contents to log, so just record that it was received.
if (!net_log_.IsCapturing()) if (!net_log_.IsCapturing())
return; return;
......
...@@ -69,7 +69,8 @@ class NET_EXPORT_PRIVATE QuicEventLogger ...@@ -69,7 +69,8 @@ class NET_EXPORT_PRIVATE QuicEventLogger
const quic::QuicTime& receive_time) override; const quic::QuicTime& receive_time) override;
void OnBlockedFrame(const quic::QuicBlockedFrame& frame) override; void OnBlockedFrame(const quic::QuicBlockedFrame& frame) override;
void OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) override; void OnGoAwayFrame(const quic::QuicGoAwayFrame& frame) override;
void OnPingFrame(const quic::QuicPingFrame& frame) override; void OnPingFrame(const quic::QuicPingFrame& frame,
quic::QuicTime::Delta ping_received_delay) override;
void OnPaddingFrame(const quic::QuicPaddingFrame& frame) override; void OnPaddingFrame(const quic::QuicPaddingFrame& frame) override;
void OnNewConnectionIdFrame( void OnNewConnectionIdFrame(
const quic::QuicNewConnectionIdFrame& frame) override; const quic::QuicNewConnectionIdFrame& frame) override;
......
...@@ -433,7 +433,7 @@ QUIC_FLAG(bool, ...@@ -433,7 +433,7 @@ QUIC_FLAG(bool,
QUIC_FLAG( QUIC_FLAG(
bool, bool,
FLAGS_quic_reloadable_flag_quic_get_stream_information_from_stream_map, FLAGS_quic_reloadable_flag_quic_get_stream_information_from_stream_map,
false) true)
// If true, QuicSession does not keep a separate zombie_streams. Instead, all // If true, QuicSession does not keep a separate zombie_streams. Instead, all
// streams are stored in stream_map_. // streams are stored in stream_map_.
......
...@@ -1398,6 +1398,9 @@ std::string QuicTestPacketMaker::GenerateHttp3SettingsData() { ...@@ -1398,6 +1398,9 @@ std::string QuicTestPacketMaker::GenerateHttp3SettingsData() {
} }
std::string QuicTestPacketMaker::GenerateHttp3MaxPushIdData() { std::string QuicTestPacketMaker::GenerateHttp3MaxPushIdData() {
if (max_allowed_push_id_ == 0) {
return "";
}
quic::MaxPushIdFrame max_push_id; quic::MaxPushIdFrame max_push_id;
max_push_id.push_id = max_allowed_push_id_; max_push_id.push_id = max_allowed_push_id_;
std::unique_ptr<char[]> buffer; std::unique_ptr<char[]> buffer;
......
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