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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/core/quic_framer_test.cc

Issue 2403183002: relnote: Remove remaining now unused FEC code from QUIC. Merge internal change: 135007563 (Closed)
Patch Set: Created 4 years, 2 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/core/quic_framer.cc ('k') | net/quic/core/quic_protocol.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_framer_test.cc
diff --git a/net/quic/core/quic_framer_test.cc b/net/quic/core/quic_framer_test.cc
index 6cd6252016941683637f96d513a1e9a0f1d36694..03fc434e56efe2dd338fbd194dbd8e3900b9a9d8 100644
--- a/net/quic/core/quic_framer_test.cc
+++ b/net/quic/core/quic_framer_test.cc
@@ -243,10 +243,6 @@ class TestQuicVisitor : public QuicFramerVisitorInterface {
void OnDecryptedPacket(EncryptionLevel level) override {}
bool OnPacketHeader(const QuicPacketHeader& header) override {
- if (header.fec_flag) {
- // Drop any FEC packet.
- return false;
- }
++packet_count_;
header_.reset(new QuicPacketHeader(header));
return accept_packet_;
@@ -686,7 +682,6 @@ TEST_P(QuicFramerTest, PacketHeader) {
EXPECT_FALSE(visitor_.header_->public_header.multipath_flag);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
@@ -756,7 +751,6 @@ TEST_P(QuicFramerTest, PacketHeaderWith0ByteConnectionId) {
EXPECT_FALSE(visitor_.header_->public_header.multipath_flag);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
@@ -831,7 +825,6 @@ TEST_P(QuicFramerTest, PacketHeaderWithVersionFlag) {
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_TRUE(visitor_.header_->public_header.version_flag);
EXPECT_EQ(GetParam(), visitor_.header_->public_header.versions[0]);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
@@ -907,7 +900,6 @@ TEST_P(QuicFramerTest, PacketHeaderWithMultipathFlag) {
EXPECT_TRUE(visitor_.header_->public_header.multipath_flag);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPathId, visitor_.header_->path_id);
@@ -990,7 +982,6 @@ TEST_P(QuicFramerTest, PacketHeaderWithBothVersionFlagAndMultipathFlag) {
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_TRUE(visitor_.header_->public_header.version_flag);
EXPECT_EQ(GetParam(), visitor_.header_->public_header.versions[0]);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPathId, visitor_.header_->path_id);
@@ -1235,7 +1226,6 @@ TEST_P(QuicFramerTest, PacketHeaderWith4BytePacketNumber) {
EXPECT_FALSE(visitor_.header_->public_header.multipath_flag);
EXPECT_FALSE(visitor_.header_->public_header.reset_flag);
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
@@ -1312,7 +1302,6 @@ TEST_P(QuicFramerTest, PacketHeaderWith2BytePacketNumber) {
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_EQ(PACKET_2BYTE_PACKET_NUMBER,
visitor_.header_->public_header.packet_number_length);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
@@ -1389,7 +1378,6 @@ TEST_P(QuicFramerTest, PacketHeaderWith1BytePacketNumber) {
EXPECT_FALSE(visitor_.header_->public_header.version_flag);
EXPECT_EQ(PACKET_1BYTE_PACKET_NUMBER,
visitor_.header_->public_header.packet_number_length);
- EXPECT_FALSE(visitor_.header_->fec_flag);
EXPECT_FALSE(visitor_.header_->entropy_flag);
EXPECT_EQ(0, visitor_.header_->entropy_hash);
EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
@@ -1432,7 +1420,6 @@ TEST_P(QuicFramerTest, PacketNumberDecreasesThenIncreases) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.packet_number = kPacketNumber - 2;
@@ -1684,32 +1671,6 @@ TEST_P(QuicFramerTest, InvalidPrivateFlag) {
QUIC_INVALID_PACKET_HEADER);
};
-TEST_P(QuicFramerTest, InvalidFECGroupOffset) {
- if (framer_.version() > QUIC_VERSION_33) {
- return;
- }
- // clang-format off
- unsigned char packet[] = {
- // public flags (8 byte connection_id)
- 0x38,
- // connection_id
- 0x10, 0x32, 0x54, 0x76,
- 0x98, 0xBA, 0xDC, 0xFE,
- // packet number
- 0x01, 0x00, 0x00, 0x00,
- 0x00, 0x00,
- // private flags (fec group)
- 0x02,
- // first fec protected packet offset
- 0x10
- };
- // clang-format on
- CheckProcessingFails(packet, arraysize(packet),
- "Illegal private flags value.",
- QUIC_INVALID_PACKET_HEADER);
-
-};
-
TEST_P(QuicFramerTest, PaddingFrame) {
// clang-format off
unsigned char packet[] = {
@@ -3922,43 +3883,11 @@ TEST_P(QuicFramerTest, OldVersionNegotiationPacket) {
}
}
-TEST_P(QuicFramerTest, DropFecPacket) {
- // clang-format off
- unsigned char packet[] = {
- // public flags (8 byte connection_id)
- 0x38,
- // connection_id
- 0x10, 0x32, 0x54, 0x76,
- 0x98, 0xBA, 0xDC, 0xFE,
- // packet number
- 0xBC, 0x9A, 0x78, 0x56,
- 0x34, 0x12,
- // private flags (fec group & FEC)
- 0x06,
- // first fec protected packet offset
- 0x01,
-
- // redundancy
- 'a', 'b', 'c', 'd',
- 'e', 'f', 'g', 'h',
- 'i', 'j', 'k', 'l',
- 'm', 'n', 'o', 'p',
- };
- if (framer_.version() > QUIC_VERSION_33) {
- return;
- }
- QuicEncryptedPacket encrypted(AsChars(packet), arraysize(packet), false);
- EXPECT_FALSE(framer_.ProcessPacket(encrypted));
- EXPECT_EQ(QUIC_INVALID_PACKET_HEADER, framer_.error());
- EXPECT_FALSE(visitor_.header_.get());
-}
-
TEST_P(QuicFramerTest, BuildPaddingFramePacket) {
QuicPacketHeader header;
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.packet_number = kPacketNumber;
@@ -4024,7 +3953,6 @@ TEST_P(QuicFramerTest, Build4ByteSequenceNumberPaddingFramePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.public_header.packet_number_length = PACKET_4BYTE_PACKET_NUMBER;
header.packet_number = kPacketNumber;
@@ -4089,7 +4017,6 @@ TEST_P(QuicFramerTest, Build2ByteSequenceNumberPaddingFramePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.public_header.packet_number_length = PACKET_2BYTE_PACKET_NUMBER;
header.packet_number = kPacketNumber;
@@ -4154,7 +4081,6 @@ TEST_P(QuicFramerTest, Build1ByteSequenceNumberPaddingFramePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER;
header.packet_number = kPacketNumber;
@@ -4219,7 +4145,6 @@ TEST_P(QuicFramerTest, BuildStreamFramePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -4294,7 +4219,6 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithVersionFlag) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = true;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -4365,7 +4289,6 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithMultipathFlag) {
header.public_header.multipath_flag = true;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.path_id = kPathId;
header.packet_number = kPacketNumber;
@@ -4446,7 +4369,6 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithBothVersionAndMultipathFlag) {
header.public_header.multipath_flag = true;
header.public_header.reset_flag = false;
header.public_header.version_flag = true;
- header.fec_flag = false;
header.entropy_flag = true;
header.path_id = kPathId;
header.packet_number = kPacketNumber;
@@ -4556,7 +4478,6 @@ TEST_P(QuicFramerTest, BuildAckFramePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -4621,7 +4542,6 @@ TEST_P(QuicFramerTest, BuildTruncatedAckFrameLargePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -4733,7 +4653,6 @@ TEST_P(QuicFramerTest, BuildTruncatedAckFrameSmallPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5051,7 +4970,6 @@ TEST_P(QuicFramerTest, BuildStopWaitingPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5101,7 +5019,6 @@ TEST_P(QuicFramerTest, BuildNewStopWaitingPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.packet_number = kPacketNumber;
@@ -5142,7 +5059,6 @@ TEST_P(QuicFramerTest, BuildRstFramePacketQuic) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.packet_number = kPacketNumber;
@@ -5215,7 +5131,6 @@ TEST_P(QuicFramerTest, BuildCloseFramePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5292,7 +5207,6 @@ TEST_P(QuicFramerTest, BuildGoAwayPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5373,7 +5287,6 @@ TEST_P(QuicFramerTest, BuildWindowUpdatePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5441,7 +5354,6 @@ TEST_P(QuicFramerTest, BuildBlockedPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5502,7 +5414,6 @@ TEST_P(QuicFramerTest, BuildPingPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -5560,7 +5471,6 @@ TEST_P(QuicFramerTest, BuildPathClosePacket) {
header.public_header.multipath_flag = true;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.path_id = kDefaultPathId;
header.packet_number = kPacketNumber;
@@ -5623,7 +5533,6 @@ TEST_P(QuicFramerTest, BuildMtuDiscoveryPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -6059,7 +5968,6 @@ TEST_P(QuicFramerTest, AckTruncationLargePacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.packet_number = kPacketNumber;
@@ -6111,7 +6019,6 @@ TEST_P(QuicFramerTest, AckTruncationSmallPacket) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = false;
header.packet_number = kPacketNumber;
@@ -6164,7 +6071,6 @@ TEST_P(QuicFramerTest, CleanTruncation) {
header.public_header.connection_id = kConnectionId;
header.public_header.reset_flag = false;
header.public_header.version_flag = false;
- header.fec_flag = false;
header.entropy_flag = true;
header.packet_number = kPacketNumber;
@@ -6244,7 +6150,6 @@ TEST_P(QuicFramerTest, EntropyFlagTest) {
ASSERT_TRUE(visitor_.header_.get());
EXPECT_TRUE(visitor_.header_->entropy_flag);
EXPECT_EQ(1 << 4, visitor_.header_->entropy_hash);
- EXPECT_FALSE(visitor_.header_->fec_flag);
};
TEST_P(QuicFramerTest, StopPacketProcessing) {
« no previous file with comments | « net/quic/core/quic_framer.cc ('k') | net/quic/core/quic_protocol.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698