Land Recent QUIC changes.

Merge internal change: 47341065

Fix to ensure the version matches before declaring that the public header
flags exceed the max value. b/9190456

Merge internal change: 47324563

Fixing another backup bug (exposed by the last fix) that if we failed to
write a standalone fin the stream would not be marked as write blocked.

Merge internal change: 47272116

Don't add QuicStreams to ActiveSessionList; Instead call DumpSession on
alive streams via QuicSession.

Merge internal change: 47226512

Making the packet sequence number variable length to minimize bytes on the wire.

Merge internal change: 47220850

Fixing a bug in quic stream where we'd send rst stream packets for
successful streams. The fin bit should be sufficient for both good
request/response pairs and early response pairs.

Merge internal change: 47086343

Don't let FEC packets consume congestion window forever. If a FEC packet
is not acked after a certain time, it is cleared from the congestion
window. This timeout is higher than normal RTO.

Merge internal change: 47056082

Add QuicSession to ActiveSessionList.

Merge internal change: 47048300

Fixing a backup/resumption bug in QUIC.

It's possible to have a full congestion window worth of packets on the wire.

If we are in this state and a session tries to SendStreamData, the
QuicPacketGenerator short-circuits without queuing packets because it checks
to see if the connection CanWrite.

When we get an ack, we check to see if we have locally queued packets, but
never call OnCanWrite on the session to clear any streams which write blocked
without queueing packets.

Merge internal change: 47000173

QUIC: wire up the server-nonce parameters to the server config.

Merge internal change: 46985067

R=rch@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=204046

Review URL: https://codereview.chromium.org/16256017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204289 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 7 insertions, 9 deletions

diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index cb30d99..64279a0 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -333,7 +333,7 @@ TEST_F(EndToEndTest, RequestOverMultiplePackets) {
   // TODO(satyashekhar): Fix this when versioning is implemented.
   client_->options()->max_packet_length =
       GetPacketHeaderSize(PACKET_8BYTE_GUID, !kIncludeVersion,
-                          NOT_IN_FEC_GROUP) +
+                          PACKET_6BYTE_SEQUENCE_NUMBER, NOT_IN_FEC_GROUP) +
       ciphertext_size;
 
   // Make sure our request is too large to fit in one packet.
@@ -365,7 +365,7 @@ TEST_F(EndToEndTest, MultipleFramesRandomOrder) {
   // TODO(satyashekhar): Fix this when versioning is implemented.
   client_->options()->max_packet_length =
       GetPacketHeaderSize(PACKET_8BYTE_GUID, !kIncludeVersion,
-                          NOT_IN_FEC_GROUP) +
+                          PACKET_6BYTE_SEQUENCE_NUMBER, NOT_IN_FEC_GROUP) +
       ciphertext_size;
   client_->options()->random_reorder = true;
 
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index c84b4e8..bfff5e6 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -189,7 +189,7 @@ QuicSession* QuicDispatcher::CreateQuicSession(
       new QuicEpollConnectionHelper(this, epoll_server);
   QuicServerSession* session = new QuicServerSession(
        config_, new QuicConnection(guid, client_address, helper, true), this);
-  session->Initialize(crypto_config_);
+  session->InitializeSession(crypto_config_);
   return session;
 }
 
diff --git a/net/tools/quic/quic_epoll_connection_helper_test.cc b/net/tools/quic/quic_epoll_connection_helper_test.cc
index 321565d..bfef1896 100644
--- a/net/tools/quic/quic_epoll_connection_helper_test.cc
+++ b/net/tools/quic/quic_epoll_connection_helper_test.cc
@@ -124,8 +124,8 @@ TEST_F(QuicConnectionHelperTest, DISABLED_TestRetransmission) {
 
   const char buffer[] = "foo";
   const size_t packet_size =
-      GetPacketHeaderSize(
-          PACKET_8BYTE_GUID, kIncludeVersion, NOT_IN_FEC_GROUP) +
+      GetPacketHeaderSize(PACKET_8BYTE_GUID, kIncludeVersion,
+                          PACKET_6BYTE_SEQUENCE_NUMBER, NOT_IN_FEC_GROUP) +
       QuicFramer::GetMinStreamFrameSize() + arraysize(buffer) - 1;
   EXPECT_CALL(*send_algorithm_,
               SentPacket(_, 1, packet_size, NOT_RETRANSMISSION));
diff --git a/net/tools/quic/quic_server.cc b/net/tools/quic/quic_server.cc
index 3728fd8..36a9d4b 100644
--- a/net/tools/quic/quic_server.cc
+++ b/net/tools/quic/quic_server.cc
@@ -170,14 +170,12 @@ void QuicServer::OnEvent(int fd, EpollEvent* event) {
     }
   }
   if (event->in_events & EPOLLOUT) {
-    LOG(INFO) << "Epollout";
     bool can_write_more = dispatcher_->OnCanWrite();
     if (can_write_more) {
       event->out_ready_mask |= EPOLLOUT;
     }
   }
   if (event->in_events & EPOLLERR) {
-    LOG(INFO) << "Epollerr";
   }
 }
 
diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc
index caabd94d..7ec991c 100644
--- a/net/tools/quic/quic_server_session.cc
+++ b/net/tools/quic/quic_server_session.cc
@@ -22,7 +22,7 @@ QuicServerSession::QuicServerSession(
 QuicServerSession::~QuicServerSession() {
 }
 
-void QuicServerSession::Initialize(
+void QuicServerSession::InitializeSession(
     const QuicCryptoServerConfig& crypto_config) {
   crypto_stream_.reset(CreateQuicCryptoServerStream(crypto_config));
 }
diff --git a/net/tools/quic/quic_server_session.h b/net/tools/quic/quic_server_session.h
index 8405372..87f37a0 100644
--- a/net/tools/quic/quic_server_session.h
+++ b/net/tools/quic/quic_server_session.h
@@ -46,7 +46,7 @@ class QuicServerSession : public QuicSession {
 
   virtual ~QuicServerSession();
 
-  virtual void Initialize(const QuicCryptoServerConfig& crypto_config);
+  virtual void InitializeSession(const QuicCryptoServerConfig& crypto_config);
 
  protected:
   // QuicSession methods: