relnote: Merge all fields of QueuedPacket into SerializedPacket. No functional change.

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.
 //
@@ skipping 618 matching lines @@
   // Return the id of the cipher of the primary decrypter of the framer.
   uint32_t cipher_id() const { return framer_.decrypter()->cipher_id(); }
 
   std::vector<QuicEncryptedPacket*>* termination_packets() {
     return termination_packets_.get();
   }
 
   bool ack_frame_updated() const;
 
  protected:
-  // Packets which have not been written to the wire.
-  struct QueuedPacket {
-    explicit QueuedPacket(SerializedPacket packet);
-    QueuedPacket(SerializedPacket packet,
-                 TransmissionType transmission_type,
-                 QuicPacketNumber original_packet_number);
-
-    SerializedPacket serialized_packet;
-    TransmissionType transmission_type;
-    // The packet's original packet number if it is a retransmission.
-    // Otherwise it must be 0.
-    QuicPacketNumber original_packet_number;
-  };
-
   // Do any work which logically would be done in OnPacket but can not be
   // safely done until the packet is validated.  Returns true if the packet
   // can be handled, false otherwise. Also migrates the connection if the packet
   // can be handled and peer address changes.
   virtual bool ProcessValidatedPacket(const QuicPacketHeader& header);
 
   // Send a packet to the peer, and takes ownership of the packet if the packet
   // cannot be written immediately.
-  virtual void SendOrQueuePacket(QueuedPacket packet);
+  virtual void SendOrQueuePacket(SerializedPacket* packet);
 
   QuicConnectionHelperInterface* helper() { return helper_; }
 
   // On peer address changes, determine and return the change type.
   virtual PeerAddressChangeType DeterminePeerAddressChangeType();
 
   // 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 QuicVersionVector& available_versions);
 
   bool peer_ip_changed() const { return peer_ip_changed_; }
 
   bool peer_port_changed() const { return peer_port_changed_; }
 
   const IPAddressNumber& migrating_peer_ip() const {
     return migrating_peer_ip_;
   }
 
  private:
   friend class test::QuicConnectionPeer;
   friend class test::PacketSavingConnection;
 
-  typedef std::list<QueuedPacket> QueuedPacketList;
+  typedef std::list<SerializedPacket> QueuedPacketList;
   typedef std::map<QuicFecGroupNumber, QuicFecGroup*> FecGroupMap;
 
   // Writes the given packet to socket, encrypted with packet's
   // encryption_level. Returns true on successful write, and false if the writer
   // was blocked and the write needs to be tried again. Notifies the
   // SentPacketManager when the write is successful and sets
   // retransmittable frames to nullptr.
   // Saves the connection close packet for later transmission, even if the
   // writer is write blocked.
-  bool WritePacket(QueuedPacket* packet);
+  bool WritePacket(SerializedPacket* packet);
 
   // Does the main work of WritePacket, but does not delete the packet or
   // retransmittable frames upon success.
-  bool WritePacketInner(QueuedPacket* packet);
+  bool WritePacketInner(SerializedPacket* packet);
 
   // Make sure an ack we got from our peer is sane.
   // Returns nullptr for valid acks or an error std::string if it was invalid.
   const char* ValidateAckFrame(const QuicAckFrame& incoming_ack);
 
   // Make sure a stop waiting we got from our peer is sane.
   // Returns nullptr if the frame is valid or an error std::string if it was
   // invalid.
   const char* ValidateStopWaitingFrame(
       const QuicStopWaitingFrame& stop_waiting);
 
   // Sends a version negotiation packet to the peer.
   void SendVersionNegotiationPacket();
 
   // Clears any accumulated frames from the last received packet.
   void ClearLastFrames();
 
-  // Deletes and clears any QueuedPackets.
+  // Deletes and clears any queued packets.
   void ClearQueuedPackets();
 
   // Closes the connection if the sent or received packet manager are tracking
   // too many outstanding packets.
   void MaybeCloseIfTooManyOutstandingPackets();
 
   // Writes as many queued packets as possible.  The connection must not be
   // blocked when this is called.
   void WriteQueuedPackets();
 
   // Writes as many pending retransmissions as possible.
   void WritePendingRetransmissions();
 
   // Returns true if the packet should be discarded and not sent.
-  bool ShouldDiscardPacket(const QueuedPacket& packet);
+  bool ShouldDiscardPacket(const SerializedPacket& packet);
 
   // 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.
@@ skipping 32 matching lines @@
   void SetRetransmissionAlarm();
 
   // Sets the MTU discovery alarm if necessary.
   void MaybeSetMtuAlarm();
 
   // On arrival of a new packet, checks to see if the socket addresses have
   // changed since the last packet we saw on this connection.
   void CheckForAddressMigration(const IPEndPoint& self_address,
                                 const IPEndPoint& peer_address);
 
-  HasRetransmittableData IsRetransmittable(const QueuedPacket& packet);
-  bool IsTerminationPacket(const QueuedPacket& packet);
+  HasRetransmittableData IsRetransmittable(const SerializedPacket& packet);
+  bool IsTerminationPacket(const SerializedPacket& packet);
 
   // Set the size of the packet we are targeting while doing path MTU discovery.
   void SetMtuDiscoveryTarget(QuicByteCount target);
 
   // Validates the potential maximum packet size, and reduces it if it exceeds
   // the largest supported by the protocol or the packet writer.
   QuicByteCount LimitMaxPacketSize(QuicByteCount suggested_max_packet_size);
 
   QuicFramer framer_;
   QuicConnectionHelperInterface* helper_;  // Not owned.
@@ skipping 196 matching lines @@
 
   // Whether a GoAway has been received.
   bool goaway_received_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicConnection);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONNECTION_H_