Land Recent QUIC changes.

net/quic/quic_connection.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // The entity that handles framing writes for a Quic client or server.
 // Each QuicSession will have a connection associated with it.
 //
 // On the server side, the Dispatcher handles the raw reads, and hands off
 // packets via ProcessUdpPacket for framing and processing.
 //
 // On the client side, the Connection handles the raw reads, as well as the
 // processing.
 //
 // Note: this class is not thread-safe.
 
 #ifndef NET_QUIC_QUIC_CONNECTION_H_
 #define NET_QUIC_QUIC_CONNECTION_H_
 
+#include <deque>
 #include <list>
 #include <map>
 #include <queue>
 #include <set>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/congestion_control/quic_congestion_manager.h"
@@ skipping 475 matching lines @@
                               RetransmissionTimeComparator>
       RetransmissionTimeouts;
 
   // Selects and updates the version of the protocol being used by selecting a
   // version from |available_versions| which is also supported. Returns true if
   // such a version exists, false otherwise.
   bool SelectMutualVersion(const QuicTagVector& available_versions);
   // Sends a version negotiation packet to the peer.
   void SendVersionNegotiationPacket();
 
-  void SetupRetransmission(QuicPacketSequenceNumber sequence_number);
+  void SetupRetransmission(QuicPacketSequenceNumber sequence_number,
+                           EncryptionLevel level);
   bool IsRetransmission(QuicPacketSequenceNumber sequence_number);
 
   void SetupAbandonFecTimer(QuicPacketSequenceNumber sequence_number);
 
   // Drop packet corresponding to |sequence_number| by deleting entries from
   // |unacked_packets_| and |retransmission_map_|, if present. We need to drop
   // all packets with encryption level NONE after the default level has been set
   // to FORWARD_SECURE.
   void DropPacket(QuicPacketSequenceNumber sequence_number);
 
   // Writes as many queued packets as possible.  The connection must not be
   // blocked when this is called.
   bool WriteQueuedPackets();
 
+  // Queues |packet| in the hopes that it can be decrypted in the
+  // future, when a new key is installed.
+  void QueueUndecryptablePacket(const QuicEncryptedPacket& packet);
+
+  // Attempts to process any queued undecryptable packets.
+  void MaybeProcessUndecryptablePackets();
+
   // If a packet can be revived from the current FEC group, then
   // revive and process the packet.
   void MaybeProcessRevivedPacket();
 
   void HandleAckForSentPackets(const QuicAckFrame& incoming_ack,
                                SequenceNumberSet* acked_packets);
   void HandleAckForSentFecPackets(const QuicAckFrame& incoming_ack,
                                   SequenceNumberSet* acked_packets);
 
   // These two are called by OnAckFrame.
@@ skipping 51 matching lines @@
   // When new packets are created which may be retransmitted, they are added
   // to this map, which contains owning pointers to the contained frames.
   UnackedPacketMap unacked_packets_;
 
   // Pending fec packets that have not been acked yet. These packets need to be
   // cleared out of the cgst_window after a timeout since FEC packets are never
   // retransmitted.
   // Ask: What should be the timeout for these packets?
   UnackedPacketMap unacked_fec_packets_;
 
+  // Collection of packets which were received before encryption was
+  // established, but which could not be decrypted.  We buffer these on
+  // the assumption that they could not be processed because they were
+  // sent with the INITIAL encryption and the CHLO message was lost.
+  std::deque<QuicEncryptedPacket*> undecryptable_packets_;
+
   // Heap of packets that we might need to retransmit, and the time at
   // which we should retransmit them. Every time a packet is sent it is added
   // to this heap which is O(log(number of pending packets to be retransmitted))
   // which might be costly. This should be optimized to O(1) by maintaining a
   // priority queue of lists of packets to be retransmitted, where list x
   // contains all packets that have been retransmitted x times.
   RetransmissionTimeouts retransmission_timeouts_;
 
   // Map from sequence number to the retransmission info.
   RetransmissionMap retransmission_map_;
@@ skipping 66 matching lines @@
   // Set to true if the udp packet headers have a new self or peer address.
   // This is checked later on validating a data or version negotiation packet.
   bool address_migrating_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicConnection);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONNECTION_H_