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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2808893003: Replace quic_restart_flag_quic_big_endian_connection_id with quic_restart_flag_quic_big_endian_conn… (Closed)
Patch Set: Created 3 years, 8 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_flags_list.h ('k') | net/quic/core/quic_utils.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 62769b6b7e6fe4138238bc965f06420b21c8be68..916127c028c8f9b8fc33de8d476767248116adc8 100644
--- a/net/quic/core/quic_framer_test.cc
+++ b/net/quic/core/quic_framer_test.cc
@@ -591,10 +591,11 @@ TEST_P(QuicFramerTest, LargePacket) {
memset(packet + header_size, 0, kMaxPacketSize - header_size);
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -629,10 +630,11 @@ TEST_P(QuicFramerTest, PacketHeader) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -659,10 +661,11 @@ TEST_P(QuicFramerTest, PacketHeader) {
} else {
expected_error = "Unable to read packet number.";
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, QUIC_INVALID_PACKET_HEADER);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, QUIC_INVALID_PACKET_HEADER);
}
}
@@ -735,10 +738,11 @@ TEST_P(QuicFramerTest, PacketHeaderWithVersionFlag) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -768,10 +772,11 @@ TEST_P(QuicFramerTest, PacketHeaderWithVersionFlag) {
} else {
expected_error = "Unable to read packet number.";
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, QUIC_INVALID_PACKET_HEADER);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, QUIC_INVALID_PACKET_HEADER);
}
}
@@ -799,10 +804,11 @@ TEST_P(QuicFramerTest, PacketHeaderWith4BytePacketNumber) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -829,10 +835,11 @@ TEST_P(QuicFramerTest, PacketHeaderWith4BytePacketNumber) {
} else {
expected_error = "Unable to read packet number.";
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, QUIC_INVALID_PACKET_HEADER);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, QUIC_INVALID_PACKET_HEADER);
}
}
@@ -860,10 +867,11 @@ TEST_P(QuicFramerTest, PacketHeaderWith2BytePacketNumber) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -892,10 +900,11 @@ TEST_P(QuicFramerTest, PacketHeaderWith2BytePacketNumber) {
} else {
expected_error = "Unable to read packet number.";
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, QUIC_INVALID_PACKET_HEADER);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, QUIC_INVALID_PACKET_HEADER);
}
}
@@ -923,10 +932,11 @@ TEST_P(QuicFramerTest, PacketHeaderWith1BytePacketNumber) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -955,10 +965,11 @@ TEST_P(QuicFramerTest, PacketHeaderWith1BytePacketNumber) {
} else {
expected_error = "Unable to read packet number.";
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, QUIC_INVALID_PACKET_HEADER);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, QUIC_INVALID_PACKET_HEADER);
}
}
@@ -1062,10 +1073,11 @@ TEST_P(QuicFramerTest, PacketWithDiversificationNonce) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1117,10 +1129,11 @@ TEST_P(QuicFramerTest, LargePublicFlagWithMismatchedVersions) {
};
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1196,10 +1209,11 @@ TEST_P(QuicFramerTest, PaddingFrame) {
}
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1215,8 +1229,9 @@ TEST_P(QuicFramerTest, PaddingFrame) {
EXPECT_EQ(28, visitor_.padding_frames_[0]->num_padding_bytes);
// A packet with no frames is not acceptable.
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -1288,10 +1303,11 @@ TEST_P(QuicFramerTest, NewPaddingFrame) {
}
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1365,10 +1381,11 @@ TEST_P(QuicFramerTest, StreamFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1388,8 +1405,9 @@ TEST_P(QuicFramerTest, StreamFrame) {
// Now test framing boundaries.
CheckStreamFrameBoundaries(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
kQuicMaxStreamIdSize, !kIncludeVersion);
}
@@ -1452,10 +1470,11 @@ TEST_P(QuicFramerTest, MissingDiversificationNonce) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1516,10 +1535,11 @@ TEST_P(QuicFramerTest, StreamFrame3ByteStreamId) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1541,8 +1561,9 @@ TEST_P(QuicFramerTest, StreamFrame3ByteStreamId) {
// Now test framing boundaries.
const size_t stream_id_size = 3;
CheckStreamFrameBoundaries(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
stream_id_size, !kIncludeVersion);
}
@@ -1599,10 +1620,11 @@ TEST_P(QuicFramerTest, StreamFrame2ByteStreamId) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1624,8 +1646,9 @@ TEST_P(QuicFramerTest, StreamFrame2ByteStreamId) {
// Now test framing boundaries.
const size_t stream_id_size = 2;
CheckStreamFrameBoundaries(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
stream_id_size, !kIncludeVersion);
}
@@ -1682,10 +1705,11 @@ TEST_P(QuicFramerTest, StreamFrame1ByteStreamId) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1707,8 +1731,9 @@ TEST_P(QuicFramerTest, StreamFrame1ByteStreamId) {
// Now test framing boundaries.
const size_t stream_id_size = 1;
CheckStreamFrameBoundaries(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
stream_id_size, !kIncludeVersion);
}
@@ -1769,10 +1794,11 @@ TEST_P(QuicFramerTest, StreamFrameWithVersion) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1794,8 +1820,9 @@ TEST_P(QuicFramerTest, StreamFrameWithVersion) {
// Now test framing boundaries.
CheckStreamFrameBoundaries(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
kQuicMaxStreamIdSize, kIncludeVersion);
}
@@ -1854,10 +1881,11 @@ TEST_P(QuicFramerTest, RejectPacket) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1892,10 +1920,11 @@ TEST_P(QuicFramerTest, RejectPublicHeader) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1952,10 +1981,11 @@ TEST_P(QuicFramerTest, AckFrameOneAckBlock) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -1994,8 +2024,9 @@ TEST_P(QuicFramerTest, AckFrameOneAckBlock) {
expected_error = "Unable to read num received packets.";
}
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2101,10 +2132,11 @@ TEST_P(QuicFramerTest, AckFrameTwoTimeStampsMultipleAckBlocks) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2194,8 +2226,9 @@ TEST_P(QuicFramerTest, AckFrameTwoTimeStampsMultipleAckBlocks) {
}
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2238,10 +2271,11 @@ TEST_P(QuicFramerTest, NewStopWaitingFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2262,8 +2296,9 @@ TEST_P(QuicFramerTest, NewStopWaitingFrame) {
string expected_error;
expected_error = "Unable to read least unacked delta.";
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2320,10 +2355,11 @@ TEST_P(QuicFramerTest, RstStreamFrameQuic) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2352,8 +2388,9 @@ TEST_P(QuicFramerTest, RstStreamFrameQuic) {
expected_error = "Unable to read rst stream error code.";
}
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2412,10 +2449,11 @@ TEST_P(QuicFramerTest, ConnectionCloseFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2443,8 +2481,9 @@ TEST_P(QuicFramerTest, ConnectionCloseFrame) {
expected_error = "Unable to read connection close error details.";
}
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2505,10 +2544,11 @@ TEST_P(QuicFramerTest, GoAwayFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2537,8 +2577,9 @@ TEST_P(QuicFramerTest, GoAwayFrame) {
expected_error = "Unable to read goaway reason.";
}
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2587,10 +2628,11 @@ TEST_P(QuicFramerTest, WindowUpdateFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2614,8 +2656,9 @@ TEST_P(QuicFramerTest, WindowUpdateFrame) {
expected_error = "Unable to read window byte_offset.";
}
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2658,10 +2701,11 @@ TEST_P(QuicFramerTest, BlockedFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2679,8 +2723,9 @@ TEST_P(QuicFramerTest, BlockedFrame) {
++i) {
string expected_error = "Unable to read stream_id.";
CheckProcessingFails(
- FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
i + GetPacketHeaderSize(framer_.version(), PACKET_8BYTE_CONNECTION_ID,
!kIncludeVersion, !kIncludeDiversificationNonce,
PACKET_6BYTE_PACKET_NUMBER),
@@ -2719,10 +2764,11 @@ TEST_P(QuicFramerTest, PingFrame) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2793,10 +2839,11 @@ TEST_P(QuicFramerTest, PublicResetPacketV33) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2814,7 +2861,7 @@ TEST_P(QuicFramerTest, PublicResetPacketV33) {
visitor_.public_reset_packet_->client_address.host().address_family());
// Now test framing boundaries.
- if (!FLAGS_quic_restart_flag_quic_big_endian_connection_id) {
+ if (!QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())) {
for (size_t i = 0; i < arraysize(packet); ++i) {
string expected_error;
QUIC_DLOG(INFO) << "iteration: " << i;
@@ -2911,10 +2958,11 @@ TEST_P(QuicFramerTest, PublicResetPacket) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -2932,7 +2980,7 @@ TEST_P(QuicFramerTest, PublicResetPacket) {
visitor_.public_reset_packet_->client_address.host().address_family());
// Now test framing boundaries.
- if (!FLAGS_quic_restart_flag_quic_big_endian_connection_id) {
+ if (!QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())) {
for (size_t i = 0; i < arraysize(packet); ++i) {
string expected_error;
QUIC_DLOG(INFO) << "iteration: " << i;
@@ -3031,13 +3079,14 @@ TEST_P(QuicFramerTest, PublicResetPacketWithTrailingJunk) {
// clang-format on
string expected_error = "Unable to read reset message.";
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? arraysize(packet_cid_be)
- : arraysize(packet),
- expected_error, QUIC_INVALID_PUBLIC_RST_PACKET);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? arraysize(packet_cid_be)
+ : arraysize(packet),
+ expected_error, QUIC_INVALID_PUBLIC_RST_PACKET);
}
TEST_P(QuicFramerTest, PublicResetPacketWithClientAddress) {
@@ -3111,10 +3160,11 @@ TEST_P(QuicFramerTest, PublicResetPacketWithClientAddress) {
// clang-format on
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -3132,7 +3182,7 @@ TEST_P(QuicFramerTest, PublicResetPacketWithClientAddress) {
EXPECT_EQ(443, visitor_.public_reset_packet_->client_address.port());
// Now test framing boundaries.
- if (!FLAGS_quic_restart_flag_quic_big_endian_connection_id) {
+ if (!QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())) {
for (size_t i = 0; i < arraysize(packet); ++i) {
string expected_error;
QUIC_DLOG(INFO) << "iteration: " << i;
@@ -3199,10 +3249,11 @@ TEST_P(QuicFramerTest, VersionNegotiationPacket) {
QuicFramerPeer::SetPerspective(&framer_, Perspective::IS_CLIENT);
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -3223,10 +3274,11 @@ TEST_P(QuicFramerTest, VersionNegotiationPacket) {
expected_error = "Unable to read supported version in negotiation.";
error_code = QUIC_INVALID_VERSION_NEGOTIATION_PACKET;
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, error_code);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, error_code);
}
}
@@ -3257,10 +3309,11 @@ TEST_P(QuicFramerTest, OldVersionNegotiationPacket) {
QuicFramerPeer::SetPerspective(&framer_, Perspective::IS_CLIENT);
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -3281,10 +3334,11 @@ TEST_P(QuicFramerTest, OldVersionNegotiationPacket) {
expected_error = "Unable to read supported version in negotiation.";
error_code = QUIC_INVALID_VERSION_NEGOTIATION_PACKET;
}
- CheckProcessingFails(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- i, expected_error, error_code);
+ CheckProcessingFails(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ i, expected_error, error_code);
}
}
@@ -3331,8 +3385,9 @@ TEST_P(QuicFramerTest, BuildPaddingFramePacket) {
uint64_t header_size = GetPacketHeaderSize(
framer_.version(), PACKET_8BYTE_CONNECTION_ID, !kIncludeVersion,
!kIncludeDiversificationNonce, PACKET_6BYTE_PACKET_NUMBER);
- memset((FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet) +
+ memset((QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet) +
header_size + 1,
0x00, kMaxPacketSize - header_size - 1);
@@ -3341,10 +3396,11 @@ TEST_P(QuicFramerTest, BuildPaddingFramePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3429,10 +3485,11 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithNewPaddingFrame) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3479,8 +3536,9 @@ TEST_P(QuicFramerTest, Build4ByteSequenceNumberPaddingFramePacket) {
uint64_t header_size = GetPacketHeaderSize(
framer_.version(), PACKET_8BYTE_CONNECTION_ID, !kIncludeVersion,
!kIncludeDiversificationNonce, PACKET_4BYTE_PACKET_NUMBER);
- memset((FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet) +
+ memset((QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet) +
header_size + 1,
0x00, kMaxPacketSize - header_size - 1);
@@ -3489,10 +3547,11 @@ TEST_P(QuicFramerTest, Build4ByteSequenceNumberPaddingFramePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3539,8 +3598,9 @@ TEST_P(QuicFramerTest, Build2ByteSequenceNumberPaddingFramePacket) {
uint64_t header_size = GetPacketHeaderSize(
framer_.version(), PACKET_8BYTE_CONNECTION_ID, !kIncludeVersion,
!kIncludeDiversificationNonce, PACKET_2BYTE_PACKET_NUMBER);
- memset((FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet) +
+ memset((QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet) +
header_size + 1,
0x00, kMaxPacketSize - header_size - 1);
@@ -3549,10 +3609,11 @@ TEST_P(QuicFramerTest, Build2ByteSequenceNumberPaddingFramePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3599,8 +3660,9 @@ TEST_P(QuicFramerTest, Build1ByteSequenceNumberPaddingFramePacket) {
uint64_t header_size = GetPacketHeaderSize(
framer_.version(), PACKET_8BYTE_CONNECTION_ID, !kIncludeVersion,
!kIncludeDiversificationNonce, PACKET_1BYTE_PACKET_NUMBER);
- memset((FLAGS_quic_restart_flag_quic_big_endian_connection_id ? packet_cid_be
- : packet) +
+ memset((QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet) +
header_size + 1,
0x00, kMaxPacketSize - header_size - 1);
@@ -3609,10 +3671,11 @@ TEST_P(QuicFramerTest, Build1ByteSequenceNumberPaddingFramePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3681,10 +3744,11 @@ TEST_P(QuicFramerTest, BuildStreamFramePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3750,10 +3814,11 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithVersionFlag) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3785,10 +3850,11 @@ TEST_P(QuicFramerTest, BuildVersionNegotiationPacket) {
SupportedVersions(GetParam())));
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3857,10 +3923,11 @@ TEST_P(QuicFramerTest, BuildAckFramePacketOneAckBlock) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -3968,10 +4035,11 @@ TEST_P(QuicFramerTest, BuildAckFramePacketMultipleAckBlocks) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4188,10 +4256,11 @@ TEST_P(QuicFramerTest, BuildAckFramePacketMaxAckBlocks) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4246,10 +4315,11 @@ TEST_P(QuicFramerTest, BuildNewStopWaitingPacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4316,10 +4386,11 @@ TEST_P(QuicFramerTest, BuildRstFramePacketQuic) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4389,10 +4460,11 @@ TEST_P(QuicFramerTest, BuildCloseFramePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4467,10 +4539,11 @@ TEST_P(QuicFramerTest, BuildGoAwayPacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4532,10 +4605,11 @@ TEST_P(QuicFramerTest, BuildWindowUpdatePacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4590,10 +4664,11 @@ TEST_P(QuicFramerTest, BuildBlockedPacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4641,10 +4716,11 @@ TEST_P(QuicFramerTest, BuildPingPacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4693,10 +4769,11 @@ TEST_P(QuicFramerTest, BuildMtuDiscoveryPacket) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4806,19 +4883,21 @@ TEST_P(QuicFramerTest, BuildPublicResetPacketOld) {
if (FLAGS_quic_reloadable_flag_quic_remove_packet_number_from_public_reset) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_no_rejected_packet_number_cid_be
- : packet_no_rejected_packet_number),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_no_rejected_packet_number_cid_be
+ : packet_no_rejected_packet_number),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_no_rejected_packet_number_cid_be)
: arraysize(packet_no_rejected_packet_number));
} else {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -4930,19 +5009,21 @@ TEST_P(QuicFramerTest, BuildPublicResetPacket) {
if (FLAGS_quic_reloadable_flag_quic_remove_packet_number_from_public_reset) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_no_rejected_packet_number_cid_be
- : packet_no_rejected_packet_number),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_no_rejected_packet_number_cid_be
+ : packet_no_rejected_packet_number),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_no_rejected_packet_number_cid_be)
: arraysize(packet_no_rejected_packet_number));
} else {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -5088,21 +5169,23 @@ TEST_P(QuicFramerTest, BuildPublicResetPacketWithClientAddress) {
if (FLAGS_quic_reloadable_flag_quic_remove_packet_number_from_public_reset) {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_no_rejected_packet_number_cid_be
- : packet_no_rejected_packet_number),
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_no_rejected_packet_number_cid_be
+ : packet_no_rejected_packet_number),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_no_rejected_packet_number_cid_be)
: arraysize(packet_no_rejected_packet_number));
} else {
test::CompareCharArraysWithHexError(
"constructed packet", data->data(), data->length(),
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet));
}
@@ -5146,10 +5229,11 @@ TEST_P(QuicFramerTest, EncryptPacket) {
// clang-format on
std::unique_ptr<QuicPacket> raw(new QuicPacket(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false, PACKET_8BYTE_CONNECTION_ID, !kIncludeVersion,
@@ -5204,10 +5288,11 @@ TEST_P(QuicFramerTest, EncryptPacketWithVersionFlag) {
// clang-format on
std::unique_ptr<QuicPacket> raw(new QuicPacket(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false, PACKET_8BYTE_CONNECTION_ID, kIncludeVersion,
@@ -5414,10 +5499,11 @@ TEST_P(QuicFramerTest, StopPacketProcessing) {
EXPECT_CALL(visitor, OnDecryptedPacket(_));
QuicEncryptedPacket encrypted(
- AsChars(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet),
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
+ AsChars(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet),
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
? arraysize(packet_cid_be)
: arraysize(packet),
false);
@@ -5591,12 +5677,13 @@ TEST_P(QuicFramerTest, FramerFuzzTest) {
};
// clang-format on
- QuicFramerFuzzFunc(FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? packet_cid_be
- : packet,
- FLAGS_quic_restart_flag_quic_big_endian_connection_id
- ? arraysize(packet_cid_be)
- : arraysize(packet));
+ QuicFramerFuzzFunc(
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? packet_cid_be
+ : packet,
+ QuicUtils::IsConnectionIdWireFormatBigEndian(framer_.perspective())
+ ? arraysize(packet_cid_be)
+ : arraysize(packet));
}
} // namespace test
« no previous file with comments | « net/quic/core/quic_flags_list.h ('k') | net/quic/core/quic_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698