summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2014-08-29 16:53:34 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-29 23:56:44 +0000
commit00f180a54e0ebf53bcadebc9983ee406818f232b (patch)
tree1f264b9435617559bc0df93f40d63e576ceea5ea /net/tools
parent15c487676ac5c50e1f59461d3c7c3f89cf27838d (diff)
downloadchromium_src-00f180a54e0ebf53bcadebc9983ee406818f232b.zip
chromium_src-00f180a54e0ebf53bcadebc9983ee406818f232b.tar.gz
chromium_src-00f180a54e0ebf53bcadebc9983ee406818f232b.tar.bz2
Revert of Landing Recent QUIC Changes. (patchset #1 id:1 of https://codereview.chromium.org/515303003/)
Reason for revert: Reverting to see if it fixes the following issue. Crash rate has gone up by 10 times. BUG=409191 Original issue's description: > Landing Recent QUIC Changes. > > Nest a QUIC SerializedPacket inside a QUIC QueuedPacket. > > Merge internal change: 74239145 > https://codereview.chromium.org/509203003/ > > > Remove PacketType from QUIC because the QUEUED type is not used and the > other types can be reduced to a bool. > > Merge internal change: 74148481 > https://codereview.chromium.org/515003003/ > > > Don't send a QUIC SCUP message until after handshake confirmed. > > A server config update was occasionally being sent before the crypto > handshake was complete, causing the client to close the connection. > > Merge internal change: 74132773 > https://codereview.chromium.org/516713002/ > > > Change TransmissionInfo's all_transmissions SequenceNumberSet* to > default to NULL, and only be present if there are multiple transmissions. > > Estimated to save ~2% of CPU. > > Merge internal change: 74076012 > https://codereview.chromium.org/509073004/ > > > Log the quic version for internal server tracing. > Not used in production. > > Merge internal change: 74069715 > https://codereview.chromium.org/514043002/ > > > Optimize QuicUnackedPacketMap by changing from a LinkedHashMap to a > deque. > > Estimated to save ~3% of CPU based on pprof profiling of 100 large gets > on tools/quic/end_to_end_test.cc. > > Merge internal change: 74054196 > https://codereview.chromium.org/514033002/ > > > Unit test for empty packet closes QUIC connection bug. > > Merge internal change: 74041239 > https://codereview.chromium.org/495423011/ > > > Log the QUIC transmission type in QUIC internal server trace visitor. > Not used in production. > > Merge internal change: 73895739 > https://codereview.chromium.org/514023002/ > > > Not used in production. Log whether a QUIC packet sent was a crypto > packet or not for internal server side tracing. > > Merge internal change: 73894063 > https://codereview.chromium.org/515003002/ > > > Fix a QUIC bug in which PING frames were not being ACK'd. > > Merge internal change: 73837644 > https://codereview.chromium.org/512933005/ > > R=rch@chromium.org > > Committed: https://chromium.googlesource.com/chromium/src/+/27f3f1894f09a96112df50fddd32895b4677f949 TBR=rch@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/523813003 Cr-Commit-Position: refs/heads/master@{#292722}
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/quic/quic_client_session_test.cc38
1 files changed, 0 insertions, 38 deletions
diff --git a/net/tools/quic/quic_client_session_test.cc b/net/tools/quic/quic_client_session_test.cc
index 96460d4..6f8136f 100644
--- a/net/tools/quic/quic_client_session_test.cc
+++ b/net/tools/quic/quic_client_session_test.cc
@@ -13,7 +13,6 @@
#include "net/quic/test_tools/quic_session_peer.h"
#include "net/quic/test_tools/quic_test_utils.h"
#include "net/tools/quic/quic_spdy_client_stream.h"
-#include "net/tools/quic/test_tools/quic_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
using net::test::CryptoTestUtils;
@@ -21,11 +20,7 @@ using net::test::DefaultQuicConfig;
using net::test::PacketSavingConnection;
using net::test::QuicSessionPeer;
using net::test::SupportedVersions;
-using net::test::TestPeerIPAddress;
using net::test::ValueRestore;
-using net::test::kTestPort;
-using net::tools::test::MockConnection;
-using testing::Invoke;
using testing::_;
namespace net {
@@ -114,39 +109,6 @@ TEST_P(ToolsQuicClientSessionTest, SetFecProtectionFromConfig) {
EXPECT_EQ(FEC_PROTECT_OPTIONAL, stream->fec_policy());
}
-TEST_P(ToolsQuicClientSessionTest, EmptyPacketReceived) {
- // This test covers broken behavior that empty packets cause QUIC connection
- // broken.
-
- // Create Packet with 0 length.
- QuicEncryptedPacket invalid_packet(nullptr, 0, false);
- IPEndPoint server_address(TestPeerIPAddress(), kTestPort);
- IPEndPoint client_address(TestPeerIPAddress(), kTestPort);
-
- EXPECT_CALL(*reinterpret_cast<MockConnection*>(session_->connection()),
- ProcessUdpPacket(server_address, client_address, _))
- .WillRepeatedly(
- Invoke(reinterpret_cast<MockConnection*>(session_->connection()),
- &MockConnection::ReallyProcessUdpPacket));
-
- // Expect call to close connection with error QUIC_INVALID_PACKET_HEADER.
- // TODO(b/17206611): Correct behavior: packet should get dropped and
- // connection should remain open.
- EXPECT_CALL(*connection_, SendConnectionCloseWithDetails(
- QUIC_INVALID_PACKET_HEADER, _)).Times(1);
- session_->connection()->ProcessUdpPacket(client_address, server_address,
- invalid_packet);
-
- // Create a packet that causes DecryptPacket failed. The packet will get
- // dropped without closing connection. This is a correct behavior.
- char buf[2] = {0x00, 0x01};
- QuicEncryptedPacket valid_packet(buf, 2, false);
- // Close connection shouldn't be called.
- EXPECT_CALL(*connection_, SendConnectionCloseWithDetails(_, _)).Times(0);
- session_->connection()->ProcessUdpPacket(client_address, server_address,
- valid_packet);
-}
-
} // namespace
} // namespace test
} // namespace tools