Queueing QUIC frames to be resent instead of packets and packing RST frames with acks and congestio…

net/quic/quic_packet_creator.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.
 //
 // Some helpers for quic packet creation.
 
 #ifndef NET_QUIC_QUIC_PACKET_CREATOR_H_
 #define NET_QUIC_QUIC_PACKET_CREATOR_H_
 
 #include <utility>
@@ skipping 34 matching lines @@
   QuicPacketCreator(QuicGuid guid, QuicFramer* framer);
 
   virtual ~QuicPacketCreator();
 
   // QuicFecBuilderInterface
   virtual void OnBuiltFecProtectedPayload(const QuicPacketHeader& header,
                                           base::StringPiece payload) OVERRIDE;
 
   typedef std::pair<QuicPacketSequenceNumber, QuicPacket*> PacketPair;
 
+  // Serializes all frames into a single packet.  All frames must fit into a
+  // single packet.
+  PacketPair SerializeAllFrames(const QuicFrames& frames);
+
   // Serializes as many non-fec frames as can fit into a single packet.
   // num_serialized is set to the number of frames serialized into the packet.
   PacketPair SerializeFrames(const QuicFrames& frames, size_t* num_serialized);
 
-  // Converts a raw payload to a series of QuicPackets.  Returns the number of
-  // bytes consumed from data.
+  // Converts a raw payload to a series of QuicPackets and matching frames in
+  // those packets.  Returns the number of bytes consumed from data.
   // If data is empty and fin is true, the expected behavior is to consume the
   // fin but return 0.
   size_t DataToStream(QuicStreamId id,
                       base::StringPiece data,
                       QuicStreamOffset offset,
                       bool fin,
-                      std::vector<PacketPair>* packets);
-
-  PacketPair ResetStream(QuicStreamId id,
-                         QuicStreamOffset offset,
-                         QuicErrorCode error);
+                      std::vector<PacketPair>* packets,
+                      QuicFrames* packetized_frames);
 
   PacketPair CloseConnection(QuicConnectionCloseFrame* close_frame);
 
-  // Increments the current sequence number in QuicPacketCreator and sets it
-  // into the packet and returns the new sequence number.
-  QuicPacketSequenceNumber SetNewSequenceNumber(QuicPacket* packet);
-
   QuicPacketSequenceNumber sequence_number() const {
     return sequence_number_;
   }
 
   void set_sequence_number(QuicPacketSequenceNumber s) {
     sequence_number_ = s;
   }
 
   Options* options() {
     return &options_;
   }
 
  private:
   void FillPacketHeader(QuicFecGroupNumber fec_group,
                         QuicPacketFlags flags,
                         QuicPacketHeader* header);
 
   Options options_;
   QuicGuid guid_;
   QuicFramer* framer_;
   QuicPacketSequenceNumber sequence_number_;
   QuicFecGroupNumber fec_group_number_;
   scoped_ptr<QuicFecGroup> fec_group_;
 
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PACKET_CREATOR_H_