diff options
author | rtenneti <rtenneti@chromium.org> | 2015-03-07 22:07:16 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-08 06:07:47 +0000 |
commit | 9e0fb50a74c11981a86c18ad507ece44735b3b98 (patch) | |
tree | 0f2b987833d4dde4e7e019c4b5cc3085bc7ba632 /net/quic/reliable_quic_stream.cc | |
parent | db5527d777f1e0cdbaec2bca579bec33aaf7497e (diff) | |
download | chromium_src-9e0fb50a74c11981a86c18ad507ece44735b3b98.zip chromium_src-9e0fb50a74c11981a86c18ad507ece44735b3b98.tar.gz chromium_src-9e0fb50a74c11981a86c18ad507ece44735b3b98.tar.bz2 |
Land Recent QUIC Changes until 03/06/2015.
CL generated with data from dead-code analysis using
.../scythe:remove_dead_code
Dead code removal.
Merge internal change: 87991626
https://codereview.chromium.org/987693006/
Add 'explicit' to the PacketWriterFactoryAdapter constructor, as
complained about by Lint.
Merge internal change: 87956343
https://codereview.chromium.org/988963002/
Adds an assert to confirm that QUIC's session flow control window is
always larger than the stream flow control window, and fixes some tests.
Merge internal change: 87837841
https://codereview.chromium.org/987943003/
Implement the "sanity checks" described in b/9509040: Incoming packets
whose connection ID is not associated with a session and is not recorded
as being in time-wait state are tested for reasonableness before a
session is created for them. This won't protect much against deliberate
DoS but will screen out a reasonable fraction of truly junk packets.
Add sanity tests so we do not create connections for initial packets
with truncated connection IDs.
Merge internal change: 87831756
https://codereview.chromium.org/981193003/
Change the null value for packet sequence numbers to
kInvalidPacketSequenceNumber (== 0), which cannot appear as a packet
sequence number.
Update QuicFecGroupTest::UpdateAndRevive and
QuicFecGroupTest::UpdateAndReviveOutOfOrder to generate packet numbers
starting with 1 rather than 0.
Change the null value for packet sequence numbers to
kNullPacketSequenceNumber (== 0).
Merge internal change: 87819844
https://codereview.chromium.org/989743003/
R=rch@chromium.org
Review URL: https://codereview.chromium.org/990533002
Cr-Commit-Position: refs/heads/master@{#319581}
Diffstat (limited to 'net/quic/reliable_quic_stream.cc')
-rw-r--r-- | net/quic/reliable_quic_stream.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc index c997d6b..adb8051 100644 --- a/net/quic/reliable_quic_stream.cc +++ b/net/quic/reliable_quic_stream.cc @@ -96,9 +96,6 @@ class ReliableQuicStream::ProxyAckNotifierDelegate // True if no pending writes remain. bool wrote_last_data_; - // Accumulators. - int num_original_packets_; - int num_original_bytes_; int num_retransmitted_packets_; int num_retransmitted_bytes_; @@ -240,10 +237,6 @@ void ReliableQuicStream::CloseConnectionWithDetails(QuicErrorCode error, session()->connection()->SendConnectionCloseWithDetails(error, details); } -QuicVersion ReliableQuicStream::version() const { - return session()->connection()->version(); -} - void ReliableQuicStream::WriteOrBufferData( StringPiece data, bool fin, @@ -509,12 +502,4 @@ void ReliableQuicStream::UpdateSendWindowOffset(QuicStreamOffset new_window) { } } -bool ReliableQuicStream::IsFlowControlBlocked() { - if (flow_controller_.IsBlocked()) { - return true; - } - return stream_contributes_to_connection_flow_control_ && - connection_flow_controller_->IsBlocked(); -} - } // namespace net |