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"
+#include "net/quic/quic_ack_notifier.h"
 #include "net/quic/quic_alarm.h"
 #include "net/quic/quic_blocked_writer_interface.h"
 #include "net/quic/quic_connection_stats.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_packet_generator.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_received_packet_manager.h"
 #include "net/quic/quic_sent_entropy_manager.h"
 
@@ skipping 166 matching lines @@
 
   // Send the data payload to the peer.
   // Returns a pair with the number of bytes consumed from data, and a boolean
   // indicating if the fin bit was consumed.  This does not indicate the data
   // has been sent on the wire: it may have been turned into a packet and queued
   // if the socket was unexpectedly blocked.
   QuicConsumedData SendStreamData(QuicStreamId id,
                                   base::StringPiece data,
                                   QuicStreamOffset offset,
                                   bool fin);
+  // Same as above, except that the provided delegate will be informed once ACKs
+  // have been received for all the packets written.
+  // The |delegate| is not owned by the QuicConnection and must outlive it.
+  QuicConsumedData SendStreamDataAndNotifyWhenAcked(
+      QuicStreamId id,
+      base::StringPiece data,
+      QuicStreamOffset offset,
+      bool fin,
+      QuicAckNotifier::DelegateInterface* delegate);
+
   // Send a stream reset frame to the peer.
   virtual void SendRstStream(QuicStreamId id,
                              QuicRstStreamErrorCode error);
 
   // Sends the connection close packet without affecting the state of the
   // connection.  This should only be called if the session is actively being
   // destroyed: otherwise call SendConnectionCloseWithDetails instead.
   virtual void SendConnectionClosePacket(QuicErrorCode error,
                                          const std::string& details);
 
@@ skipping 271 matching lines @@
   typedef std::list<QueuedPacket> QueuedPacketList;
   typedef linked_hash_map<QuicPacketSequenceNumber,
                           RetransmittableFrames*> UnackedPacketMap;
   typedef std::map<QuicFecGroupNumber, QuicFecGroup*> FecGroupMap;
   typedef base::hash_map<QuicPacketSequenceNumber,
                          RetransmissionInfo> RetransmissionMap;
   typedef std::priority_queue<RetransmissionTime,
                               std::vector<RetransmissionTime>,
                               RetransmissionTimeComparator>
       RetransmissionTimeouts;
+  typedef std::list<QuicAckNotifier*> AckNotifierList;
 
   // Sends a version negotiation packet to the peer.
   void SendVersionNegotiationPacket();
 
   void SetupRetransmission(QuicPacketSequenceNumber sequence_number,
                            EncryptionLevel level);
   bool IsRetransmission(QuicPacketSequenceNumber sequence_number);
 
   void SetupAbandonFecTimer(QuicPacketSequenceNumber sequence_number);
 
@@ skipping 177 matching lines @@
 
   // True if the last ack received from the peer may have been truncated.  False
   // otherwise.
   bool received_truncated_ack_;
   bool send_ack_in_response_to_packet_;
 
   // 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_;
 
+  // On every ACK frame received by this connection, all the ack_notifiers_ will
+  // be told which sequeunce numbers were ACKed.
+  // Once a given QuicAckNotifier has seen all the sequence numbers it is
+  // interested in, it will be deleted, and removed from this list.
+  AckNotifierList ack_notifiers_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicConnection);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONNECTION_H_