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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2808273006: Landing Recent QUIC changes until Sun Apr 9 16:12:55 (Closed)
Patch Set: increment enabled_options in e2e test 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_connection.cc ('k') | net/quic/core/quic_crypto_client_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_connection_test.cc
diff --git a/net/quic/core/quic_connection_test.cc b/net/quic/core/quic_connection_test.cc
index 92b57be616cf7c14f9fea8da6d6d5370eedf2a37..144f6744650cd40528db1d7202c704ff1ae64264 100644
--- a/net/quic/core/quic_connection_test.cc
+++ b/net/quic/core/quic_connection_test.cc
@@ -690,7 +690,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
peer_framer_(SupportedVersions(version()),
QuicTime::Zero(),
Perspective::IS_SERVER),
- peer_creator_(connection_id_,
+ peer_creator_(GetPeerInMemoryConnectionId(connection_id_),
&peer_framer_,
&buffer_allocator_,
/*delegate=*/nullptr),
@@ -832,7 +832,8 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
QuicFrame frame,
EncryptionLevel level) {
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.packet_number_length = packet_number_length_;
header.public_header.connection_id_length = connection_id_length_;
header.public_header.multipath_flag = false;
@@ -942,7 +943,10 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
QuicPacket* ConstructDataPacket(QuicPacketNumber number,
bool has_stop_waiting) {
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ // Set connection_id to peer's in memory representation as this data packet
+ // is created by peer_framer.
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.packet_number_length = packet_number_length_;
header.public_header.connection_id_length = connection_id_length_;
header.public_header.multipath_flag = false;
@@ -958,7 +962,10 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
QuicPacket* ConstructClosePacket(QuicPacketNumber number) {
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ // Set connection_id to peer's in memory representation as this connection
+ // close packet is created by peer_framer.
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.packet_number = number;
QuicConnectionCloseFrame qccf;
@@ -1199,7 +1206,8 @@ TEST_P(QuicConnectionTest, IncreaseServerMaxPacketSize) {
connection_.SetMaxPacketLength(1000);
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.version_flag = true;
header.packet_number = 1;
@@ -1232,7 +1240,8 @@ TEST_P(QuicConnectionTest, IncreaseServerMaxPacketSizeWhileWriterLimited) {
EXPECT_EQ(1000u, connection_.max_packet_length());
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.version_flag = true;
header.packet_number = 1;
@@ -4323,7 +4332,9 @@ TEST_P(QuicConnectionTest, SendWhenDisconnected) {
TEST_P(QuicConnectionTest, PublicReset) {
QuicPublicResetPacket header;
- header.public_header.connection_id = connection_id_;
+ // Public reset packet in only built by server.
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.reset_flag = true;
header.public_header.version_flag = false;
header.rejected_packet_number = 10101;
@@ -4390,7 +4401,8 @@ TEST_P(QuicConnectionTest, ServerSendsVersionNegotiationPacket) {
peer_framer_.set_version_for_tests(QUIC_VERSION_UNSUPPORTED);
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.version_flag = true;
header.packet_number = 12;
@@ -4425,7 +4437,8 @@ TEST_P(QuicConnectionTest, ServerSendsVersionNegotiationPacketSocketBlocked) {
peer_framer_.set_version_for_tests(QUIC_VERSION_UNSUPPORTED);
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.version_flag = true;
header.packet_number = 12;
@@ -4467,7 +4480,8 @@ TEST_P(QuicConnectionTest,
peer_framer_.set_version_for_tests(QUIC_VERSION_UNSUPPORTED);
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.public_header.version_flag = true;
header.packet_number = 12;
@@ -4496,8 +4510,8 @@ TEST_P(QuicConnectionTest, ClientHandlesVersionNegotiation) {
// Send a version negotiation packet.
std::unique_ptr<QuicEncryptedPacket> encrypted(
- peer_framer_.BuildVersionNegotiationPacket(connection_id_,
- AllSupportedVersions()));
+ peer_framer_.BuildVersionNegotiationPacket(
+ GetPeerInMemoryConnectionId(connection_id_), AllSupportedVersions()));
std::unique_ptr<QuicReceivedPacket> received(
ConstructReceivedPacket(*encrypted, QuicTime::Zero()));
connection_.ProcessUdpPacket(kSelfAddress, kPeerAddress, *received);
@@ -4505,7 +4519,8 @@ TEST_P(QuicConnectionTest, ClientHandlesVersionNegotiation) {
// Now force another packet. The connection should transition into
// NEGOTIATED_VERSION state and tell the packet creator to StopSendingVersion.
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.packet_number = 12;
header.public_header.version_flag = false;
QuicFrames frames;
@@ -4531,8 +4546,8 @@ TEST_P(QuicConnectionTest, BadVersionNegotiation) {
OnConnectionClosed(QUIC_INVALID_VERSION_NEGOTIATION_PACKET, _,
ConnectionCloseSource::FROM_SELF));
std::unique_ptr<QuicEncryptedPacket> encrypted(
- framer_.BuildVersionNegotiationPacket(connection_id_,
- AllSupportedVersions()));
+ framer_.BuildVersionNegotiationPacket(
+ GetPeerInMemoryConnectionId(connection_id_), AllSupportedVersions()));
std::unique_ptr<QuicReceivedPacket> received(
ConstructReceivedPacket(*encrypted, QuicTime::Zero()));
connection_.ProcessUdpPacket(kSelfAddress, kPeerAddress, *received);
@@ -4588,7 +4603,8 @@ TEST_P(QuicConnectionTest, CheckSendStats) {
TEST_P(QuicConnectionTest, ProcessFramesIfPacketClosedConnection) {
// Construct a packet with stream frame and connection close frame.
QuicPacketHeader header;
- header.public_header.connection_id = connection_id_;
+ header.public_header.connection_id =
+ GetPeerInMemoryConnectionId(connection_id_);
header.packet_number = 1;
header.public_header.version_flag = false;
« no previous file with comments | « net/quic/core/quic_connection.cc ('k') | net/quic/core/quic_crypto_client_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698