Commit 29069e74 authored by Bence Béky's avatar Bence Béky Committed by Commit Bot

Roll src/net/third_party/quiche/src/ 9d0a88542..8b78f8815 (5 commits)

https://quiche.googlesource.com/quiche.git/+log/9d0a88542030..8b78f8815623

$ git log 9d0a88542..8b78f8815 --date=short --no-merges --format='%ad %ae %s'
2020-05-19 nharper Allow TLS early data in non-IETF QUIC versions.
2020-05-19 wub Change quicpacketwriter::getnextwritelocation to return a release function used to free a writer-allocated buffer. use this release function to avoid buffer leak if a writer buffer is allocated but writer->writepacket is not called. protected by --gfe2_reloadable_flag_quic_avoid_leak_writer_buffer.
2020-05-19 fayang In quic, clear last_inflight_packets_sent_time_ of a packet number space if there is no bytes in flight. protected by gfe2_reloadable_flag_quic_fix_last_inflight_packets_sent_time.
2020-05-19 bnc Simplify AckNotifierWithPacketLossAndBlockedSocket test.
2020-05-19 dschinazi Add transport parameters to QuicConnectionDebugVisitor

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

Change-Id: I997e518573df7fb6d5abf0fbeeb91f78b2580383
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209811
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Auto-Submit: Bence Béky <bnc@chromium.org>
Reviewed-by: default avatarZhongyi Shi <zhongyi@chromium.org>
Reviewed-by: default avatarTakumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770688}
parent a013fb12
......@@ -305,7 +305,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'quiche_revision': '9d0a88542030288b1e02646485b929abb1f0f481',
'quiche_revision': '8b78f88156231618db1dafaa2240b08f3b2a7623',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other.
......
......@@ -71,11 +71,12 @@ quic::QuicByteCount NetworkServiceQuicPacketWriter::GetMaxPacketSize(
return quic::kMaxOutgoingPacketSize;
}
char* NetworkServiceQuicPacketWriter::GetNextWriteLocation(
quic::QuicPacketBuffer NetworkServiceQuicPacketWriter::GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) {
// In PassThrough mode, this method isn't used and should return nullptr.
return nullptr;
// In PassThrough mode, this method isn't used and should return
// a null QuicPacketBuffer.
return {nullptr, nullptr};
}
void NetworkServiceQuicPacketWriter::SetWritable() {
......
......@@ -59,7 +59,7 @@ class NetworkServiceQuicPacketWriter : quic::QuicPacketWriter {
quic::QuicByteCount GetMaxPacketSize(
const quic::QuicSocketAddress& peer_address) const override;
char* GetNextWriteLocation(
quic::QuicPacketBuffer GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) override;
......
......@@ -263,10 +263,10 @@ bool QuicChromiumPacketWriter::IsBatchMode() const {
return false;
}
char* QuicChromiumPacketWriter::GetNextWriteLocation(
quic::QuicPacketBuffer QuicChromiumPacketWriter::GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) {
return nullptr;
return {nullptr, nullptr};
}
quic::WriteResult QuicChromiumPacketWriter::Flush() {
......
......@@ -94,7 +94,7 @@ class NET_EXPORT_PRIVATE QuicChromiumPacketWriter
const quic::QuicSocketAddress& peer_address) const override;
bool SupportsReleaseTime() const override;
bool IsBatchMode() const override;
char* GetNextWriteLocation(
quic::QuicPacketBuffer GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) override;
quic::WriteResult Flush() override;
......
......@@ -424,3 +424,13 @@ QUIC_FLAG(
bool,
FLAGS_quic_reloadable_flag_quic_fix_write_pending_crypto_retransmission,
false)
// If true, clear last_inflight_packets_sent_time_ of a packet number space when
// there is no bytes in flight.
QUIC_FLAG(bool,
FLAGS_quic_reloadable_flag_quic_fix_last_inflight_packets_sent_time,
true)
// If true, QUIC will free writer-allocated packet buffer if writer->WritePacket
// is not called.
QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_avoid_leak_writer_buffer, false)
......@@ -88,10 +88,10 @@ bool QuicSimpleServerPacketWriter::IsBatchMode() const {
return false;
}
char* QuicSimpleServerPacketWriter::GetNextWriteLocation(
quic::QuicPacketBuffer QuicSimpleServerPacketWriter::GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) {
return nullptr;
return {nullptr, nullptr};
}
quic::WriteResult QuicSimpleServerPacketWriter::Flush() {
......
......@@ -50,7 +50,7 @@ class QuicSimpleServerPacketWriter : public quic::QuicPacketWriter {
const quic::QuicSocketAddress& peer_address) const override;
bool SupportsReleaseTime() const override;
bool IsBatchMode() const override;
char* GetNextWriteLocation(
quic::QuicPacketBuffer GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) override;
quic::WriteResult Flush() override;
......
......@@ -116,11 +116,11 @@ class P2PQuicPacketWriter : public quic::QuicPacketWriter,
return false;
}
char* GetNextWriteLocation(
quic::QuicPacketBuffer GetNextWriteLocation(
const quic::QuicIpAddress& self_address,
const quic::QuicSocketAddress& peer_address) override {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
return nullptr;
return {nullptr, nullptr};
}
quic::WriteResult Flush() override {
......
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