Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Unified Diff: net/quic/quic_sent_packet_manager.cc

Issue 449273002: Along with sending the SCUP message, this CL includes small fixes which (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Trigger_QUIC_tracegraf_72571464
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager.h ('k') | net/quic/test_tools/crypto_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_sent_packet_manager.cc
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index f233d8ba7bd327959c4c512e24d4164fab4b7d4b..a0ce684fe7f9d848c5a4427630254d1f77a5af94 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -87,7 +87,8 @@ QuicSentPacketManager::QuicSentPacketManager(
consecutive_crypto_retransmission_count_(0),
pending_tlp_transmission_(false),
max_tail_loss_probes_(kDefaultMaxTailLossProbes),
- using_pacing_(false) {
+ using_pacing_(false),
+ handshake_confirmed_(false) {
}
QuicSentPacketManager::~QuicSentPacketManager() {
@@ -606,7 +607,9 @@ bool QuicSentPacketManager::MaybeRetransmitTailLossProbe() {
if (!it->second.in_flight || frames == NULL) {
continue;
}
- DCHECK_NE(IS_HANDSHAKE, frames->HasCryptoHandshake());
+ if (!handshake_confirmed_) {
+ DCHECK_NE(IS_HANDSHAKE, frames->HasCryptoHandshake());
+ }
MarkForRetransmission(sequence_number, TLP_RETRANSMISSION);
return true;
}
@@ -652,7 +655,7 @@ void QuicSentPacketManager::RetransmitAllPackets() {
QuicSentPacketManager::RetransmissionTimeoutMode
QuicSentPacketManager::GetRetransmissionMode() const {
DCHECK(unacked_packets_.HasInFlightPackets());
- if (unacked_packets_.HasPendingCryptoPackets()) {
+ if (!handshake_confirmed_ && unacked_packets_.HasPendingCryptoPackets()) {
return HANDSHAKE_MODE;
}
if (loss_algorithm_->GetLossTimeout() != QuicTime::Zero()) {
« no previous file with comments | « net/quic/quic_sent_packet_manager.h ('k') | net/quic/test_tools/crypto_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698