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

Side by Side Diff: net/quic/quic_sent_packet_manager_test.cc

Issue 285233006: Fix a QUIC bug where a packet could remain in the UnackedPacketMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_unacked_packet_map.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_sent_packet_manager.h" 5 #include "net/quic/quic_sent_packet_manager.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "net/quic/test_tools/quic_config_peer.h" 8 #include "net/quic/test_tools/quic_config_peer.h"
9 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h" 9 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h"
10 #include "net/quic/test_tools/quic_test_utils.h" 10 #include "net/quic/test_tools/quic_test_utils.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 } 184 }
185 185
186 void SendCryptoPacket(QuicPacketSequenceNumber sequence_number) { 186 void SendCryptoPacket(QuicPacketSequenceNumber sequence_number) {
187 EXPECT_CALL(*send_algorithm_, 187 EXPECT_CALL(*send_algorithm_,
188 OnPacketSent(_, BytesInFlight(), sequence_number, 188 OnPacketSent(_, BytesInFlight(), sequence_number,
189 kDefaultLength, HAS_RETRANSMITTABLE_DATA)) 189 kDefaultLength, HAS_RETRANSMITTABLE_DATA))
190 .Times(1).WillOnce(Return(true)); 190 .Times(1).WillOnce(Return(true));
191 SerializedPacket packet(CreateDataPacket(sequence_number)); 191 SerializedPacket packet(CreateDataPacket(sequence_number));
192 packet.retransmittable_frames->AddStreamFrame( 192 packet.retransmittable_frames->AddStreamFrame(
193 new QuicStreamFrame(1, false, 0, IOVector())); 193 new QuicStreamFrame(1, false, 0, IOVector()));
194 packet.retransmittable_frames->set_encryption_level(ENCRYPTION_NONE);
194 manager_.OnSerializedPacket(packet); 195 manager_.OnSerializedPacket(packet);
195 manager_.OnPacketSent(sequence_number, clock_.ApproximateNow(), 196 manager_.OnPacketSent(sequence_number, clock_.ApproximateNow(),
196 packet.packet->length(), NOT_RETRANSMISSION, 197 packet.packet->length(), NOT_RETRANSMISSION,
197 HAS_RETRANSMITTABLE_DATA); 198 HAS_RETRANSMITTABLE_DATA);
198 } 199 }
199 200
200 void SendFecPacket(QuicPacketSequenceNumber sequence_number) { 201 void SendFecPacket(QuicPacketSequenceNumber sequence_number) {
201 EXPECT_CALL(*send_algorithm_, 202 EXPECT_CALL(*send_algorithm_,
202 OnPacketSent(_, BytesInFlight(), sequence_number, 203 OnPacketSent(_, BytesInFlight(), sequence_number,
203 kDefaultLength, NO_RETRANSMITTABLE_DATA)) 204 kDefaultLength, NO_RETRANSMITTABLE_DATA))
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 // Now retransmit all the unacked packets, which occurs when there is a 975 // Now retransmit all the unacked packets, which occurs when there is a
975 // version negotiation. 976 // version negotiation.
976 manager_.RetransmitUnackedPackets(ALL_PACKETS); 977 manager_.RetransmitUnackedPackets(ALL_PACKETS);
977 QuicPacketSequenceNumber unacked[] = { 1, 2 }; 978 QuicPacketSequenceNumber unacked[] = { 1, 2 };
978 VerifyUnackedPackets(unacked, arraysize(unacked)); 979 VerifyUnackedPackets(unacked, arraysize(unacked));
979 EXPECT_TRUE(manager_.HasPendingRetransmissions()); 980 EXPECT_TRUE(manager_.HasPendingRetransmissions());
980 EXPECT_TRUE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_)); 981 EXPECT_TRUE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_));
981 EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); 982 EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
982 } 983 }
983 984
985 TEST_F(QuicSentPacketManagerTest,
986 CryptoHandshakeRetransmissionThenNeuterAndAck) {
987 // Send 1 crypto packet.
988 SendCryptoPacket(1);
989 EXPECT_TRUE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_));
990
991 // Retransmit the crypto packet as 2.
992 manager_.OnRetransmissionTimeout();
993 RetransmitNextPacket(2);
994
995 // Now neuter all unacked unencrypted packets, which occurs when the
996 // connection goes forward secure.
997 manager_.NeuterUnencryptedPackets();
998 QuicPacketSequenceNumber unacked[] = { 1, 2 };
999 VerifyUnackedPackets(unacked, arraysize(unacked));
1000 VerifyRetransmittablePackets(NULL, 0);
1001 EXPECT_FALSE(manager_.HasPendingRetransmissions());
1002 EXPECT_FALSE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_));
1003 EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
1004
1005 // Ensure both packets get discarded when packet 2 is acked.
1006 ReceivedPacketInfo received_info;
1007 received_info.largest_observed = 2;
1008 received_info.missing_packets.insert(1);
1009 ExpectUpdatedRtt(2);
1010 manager_.OnIncomingAck(received_info, clock_.ApproximateNow());
1011 VerifyUnackedPackets(NULL, 0);
1012 VerifyRetransmittablePackets(NULL, 0);
1013 }
1014
984 TEST_F(QuicSentPacketManagerTest, TailLossProbeTimeoutUnsentDataPacket) { 1015 TEST_F(QuicSentPacketManagerTest, TailLossProbeTimeoutUnsentDataPacket) {
985 QuicSentPacketManagerPeer::SetMaxTailLossProbes(&manager_, 2); 1016 QuicSentPacketManagerPeer::SetMaxTailLossProbes(&manager_, 2);
986 // Serialize two data packets and send the latter. 1017 // Serialize two data packets and send the latter.
987 SerializedPacket packet(CreateDataPacket(1)); 1018 SerializedPacket packet(CreateDataPacket(1));
988 manager_.OnSerializedPacket(packet); 1019 manager_.OnSerializedPacket(packet);
989 SendDataPacket(2); 1020 SendDataPacket(2);
990 EXPECT_FALSE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_)); 1021 EXPECT_FALSE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_));
991 EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); 1022 EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_));
992 1023
993 // Retransmit 1 unacked packets, but not the first serialized packet. 1024 // Retransmit 1 unacked packets, but not the first serialized packet.
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1193 1224
1194 EXPECT_EQ(kTime, 1225 EXPECT_EQ(kTime,
1195 QuicSentPacketManagerPeer::GetLossAlgorithm( 1226 QuicSentPacketManagerPeer::GetLossAlgorithm(
1196 &manager_)->GetLossDetectionType()); 1227 &manager_)->GetLossDetectionType());
1197 } 1228 }
1198 1229
1199 1230
1200 } // namespace 1231 } // namespace
1201 } // namespace test 1232 } // namespace test
1202 } // namespace net 1233 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_unacked_packet_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698