Landing Recent QUIC changes until and including Mon Nov 16 14:15:48 2015

net/quic/quic_packet_generator.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.
 //
 // Responsible for generating packets on behalf of a QuicConnection.
 // Packets are serialized just-in-time.  Control frames are queued.
 // Ack and Feedback frames will be requested from the Connection
 // just-in-time.  When a packet needs to be sent, the Generator
 // will serialize a packet and pass it to QuicConnection::SendOrQueuePacket()
 //
@@ skipping 47 matching lines @@
 #include "net/quic/quic_packet_creator.h"
 #include "net/quic/quic_sent_packet_manager.h"
 #include "net/quic/quic_types.h"
 
 namespace net {
 
 namespace test {
 class QuicPacketGeneratorPeer;
 }  // namespace test
 
-class NET_EXPORT_PRIVATE QuicPacketGenerator {
+class NET_EXPORT_PRIVATE QuicPacketGenerator
+    : public QuicPacketCreator::DelegateInterface {
  public:
   class NET_EXPORT_PRIVATE DelegateInterface {
    public:
     virtual ~DelegateInterface() {}
     virtual bool ShouldGeneratePacket(HasRetransmittableData retransmittable,
                                       IsHandshake handshake) = 0;
     virtual void PopulateAckFrame(QuicAckFrame* ack) = 0;
     virtual void PopulateStopWaitingFrame(
         QuicStopWaitingFrame* stop_waiting) = 0;
     // Takes ownership of |packet.packet| and |packet.retransmittable_frames|.
@@ skipping 12 matching lines @@
 
     // Called when a frame has been added to the current packet.
     virtual void OnFrameAddedToPacket(const QuicFrame& frame) {}
   };
 
   QuicPacketGenerator(QuicConnectionId connection_id,
                       QuicFramer* framer,
                       QuicRandom* random_generator,
                       DelegateInterface* delegate);
 
-  virtual ~QuicPacketGenerator();
+  ~QuicPacketGenerator() override;
 
   // Called by the connection in the event of the congestion window changing.
   void OnCongestionWindowChange(QuicPacketCount max_packets_in_flight);
 
   // Called by the connection when the RTT may have changed.
   void OnRttChange(QuicTime::Delta rtt);
 
   // Indicates that an ACK frame should be sent.
   // If |also_send_stop_waiting| is true, then it also indicates that a
   // STOP_WAITING frame should be sent as well.
@@ skipping 64 matching lines @@
   // Called after sending |packet_number| to determine whether an FEC alarm
   // should be set for sending out an FEC packet. Returns a positive and finite
   // timeout if an FEC alarm should be set, and infinite if no alarm should be
   // set. OnFecTimeout should be called to send the FEC packet when the alarm
   // fires.
   QuicTime::Delta GetFecTimeout(QuicPacketNumber packet_number);
 
   // Sets the encrypter to use for the encryption level.
   void SetEncrypter(EncryptionLevel level, QuicEncrypter* encrypter);
 
+  // QuicPacketCreator::DelegateInterface.
+  void OnSerializedPacket(SerializedPacket* serialized_packet) override;
+
   // Sets the encryption level that will be applied to new packets.
   void set_encryption_level(EncryptionLevel level);
 
   // packet number of the last created packet, or 0 if no packets have been
   // created.
   QuicPacketNumber packet_number() const;
 
   // Returns the maximum packet length.  Note that this is the long-term maximum
   // packet length, and it may not be the maximum length of the current packet,
   // if the generator is in the middle of the packet (in batch mode) or FEC
@@ skipping 53 matching lines @@
   void ResetFecGroup();
 
   void SendQueuedFrames(bool flush, bool is_fec_timeout);
 
   // Test to see if we have pending ack, or control frames.
   bool HasPendingFrames() const;
   // Test to see if the addition of a pending frame (which might be
   // retransmittable) would still allow the resulting packet to be sent now.
   bool CanSendWithNextPendingFrameAddition() const;
   // Add exactly one pending frame, preferring ack frames over control frames.
+  // Returns true if a pending frame is successfully added.
+  // Returns false and flushes current open packet if the pending frame cannot
+  // fit into current open packet.
   bool AddNextPendingFrame();
   // Adds a frame and takes ownership of the underlying buffer.
   bool AddFrame(const QuicFrame& frame,
                 UniqueStreamBuffer buffer,
                 bool needs_padding);
 
-  void SerializeAndSendPacket();
-
   DelegateInterface* delegate_;
   DebugDelegate* debug_delegate_;
 
   QuicPacketCreator packet_creator_;
   QuicFrames queued_control_frames_;
 
   // True if batch mode is currently enabled.
   bool batch_mode_;
 
   // Timeout used for FEC alarm. Can be set to zero initially or if the SRTT has
@@ skipping 32 matching lines @@
   // the maximum size we are actually using now, if we are in the middle of the
   // packet.
   QuicByteCount max_packet_length_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicPacketGenerator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_GENERATOR_H_