Landing Recent QUIC changes until 5:55 PM, Aug 25, 2016 UTC-4

net/quic/core/quic_buffered_packet_store.h

Index: net/quic/core/quic_buffered_packet_store.h
diff --git a/net/quic/core/quic_buffered_packet_store.h b/net/quic/core/quic_buffered_packet_store.h
index 1f04e65e691385504206fabb371c66e60b0ad735..df72697a58e701cacacabfe487e8452d9395d7bf 100644
--- a/net/quic/core/quic_buffered_packet_store.h
+++ b/net/quic/core/quic_buffered_packet_store.h
@@ -19,9 +19,15 @@ namespace test {
 class QuicBufferedPacketStorePeer;
 }  // namespace test
 
-// This class buffers undeliverable packets for each connection until either
-// 1) They are requested to be delivered via DeliverPacket(), or
+// This class buffers packets for each connection until either
+// 1) They are requested to be delivered via
+//    DeliverPacket()/DeliverPacketsForNextConnection(), or
 // 2) They expire after exceeding their lifetime in the store.
+//
+// It can only buffer packets on certain number of connections. It has two pools
+// of connections: connections with CHLO buffered and those without CHLO. The
+// latter has its own upper limit along with the max number of connections this
+// store can hold. The former pool can grow till this store is full.
 class NET_EXPORT_PRIVATE QuicBufferedPacketStore {
  public:
   enum EnqueuePacketResult {
@@ -85,7 +91,8 @@ class NET_EXPORT_PRIVATE QuicBufferedPacketStore {
   EnqueuePacketResult EnqueuePacket(QuicConnectionId connection_id,
                                     const QuicReceivedPacket& packet,
                                     IPEndPoint server_address,
-                                    IPEndPoint client_address);
+                                    IPEndPoint client_address,
+                                    bool is_chlo);
 
   // Returns true if there are any packets buffered for |connection_id|.
   bool HasBufferedPackets(QuicConnectionId connection_id) const;
@@ -101,14 +108,30 @@ class NET_EXPORT_PRIVATE QuicBufferedPacketStore {
   // Resets the alarm at the end.
   void OnExpirationTimeout();
 
+  // Delivers buffered packets for next connection with CHLO to open.
+  // Return connection id for next connection in |connection_id|
+  // and all buffered packets including CHLO.
+  // The returned std::list should at least has one packet(CHLO) if
+  // store does have any connection to open. If no connection in the store has
+  // received CHLO yet, empty std::list will be returned.
+  std::list<BufferedPacket> DeliverPacketsForNextConnection(
+      QuicConnectionId* connection_id);
+
+  // Is given connection already buffered in the store?
+  bool HasChloForConnection(QuicConnectionId connection_id);
+
+  // Is there any CHLO buffered in the store?
+  bool HasChlosBuffered() const;
+
  private:
   friend class test::QuicBufferedPacketStorePeer;
 
   // Set expiration alarm if it hasn't been set.
   void MaybeSetExpirationAlarm();
 
-  // Return true if number of connections in the store reaches maximum.
-  bool IsFull();
+  // Return true if add an extra packet will go beyond allowed max connection
+  // limit. The limit for non-CHLO packet and CHLO packet is different.
+  bool ShouldBufferPacket(bool is_chlo);
 
   // A map to store packet queues with creation time for each connection.
   BufferedPacketMap undecryptable_packets_;
@@ -123,6 +146,10 @@ class NET_EXPORT_PRIVATE QuicBufferedPacketStore {
   // This alarm fires every |connection_life_span_| to clean up
   // packets staying in the store for too long.
   std::unique_ptr<QuicAlarm> expiration_alarm_;
+
+  // Keeps track of connection with CHLO buffered up already and the order they
+  // arrive.
+  linked_hash_map<QuicConnectionId, bool> connections_with_chlo_;
 };
 
 }  // namespace net