Revert 204046 "Land Recent QUIC changes."

trunk/src/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 413 matching lines @@
   // sent immediately and the send scheduler will not be consulted.
   bool WritePacket(EncryptionLevel level,
                    QuicPacketSequenceNumber sequence_number,
                    QuicPacket* packet,
                    HasRetransmittableData retransmittable,
                    Force force);
 
   // Make sure an ack we got from our peer is sane.
   bool ValidateAckFrame(const QuicAckFrame& incoming_ack);
 
+  // These two are called by OnAckFrame to update the appropriate internal
+  // state.
+  //
+  // Updates internal state based on incoming_ack.received_info
+  void UpdatePacketInformationReceivedByPeer(
+      const QuicAckFrame& incoming_ack);
+  // Updates internal state based in incoming_ack.sent_info
+  void UpdatePacketInformationSentByPeer(const QuicAckFrame& incoming_ack);
+
   QuicConnectionHelperInterface* helper() { return helper_.get(); }
 
  protected:
   QuicFramer framer_;
 
  private:
   friend class test::QuicConnectionPeer;
 
   // Packets which have not been written to the wire.
   // Owns the QuicPacket* packet.
@@ skipping 10 matching lines @@
 
     QuicPacketSequenceNumber sequence_number;
     QuicPacket* packet;
     const EncryptionLevel encryption_level;
     HasRetransmittableData retransmittable;
   };
 
   struct RetransmissionInfo {
     explicit RetransmissionInfo(QuicPacketSequenceNumber sequence_number)
         : sequence_number(sequence_number),
+          scheduled_time(QuicTime::Zero()),
           number_nacks(0),
           number_retransmissions(0) {
     }
 
     QuicPacketSequenceNumber sequence_number;
+    QuicTime scheduled_time;
     size_t number_nacks;
     size_t number_retransmissions;
   };
 
-  struct RetransmissionTime {
-    RetransmissionTime(QuicPacketSequenceNumber sequence_number,
-                       const QuicTime& scheduled_time,
-                       bool for_fec)
-        : sequence_number(sequence_number),
-          scheduled_time(scheduled_time),
-          for_fec(for_fec) { }
-
-    QuicPacketSequenceNumber sequence_number;
-    QuicTime scheduled_time;
-    bool for_fec;
-  };
-
-  class RetransmissionTimeComparator {
+  class RetransmissionInfoComparator {
    public:
-    bool operator()(const RetransmissionTime& lhs,
-                    const RetransmissionTime& rhs) const {
+    bool operator()(const RetransmissionInfo& lhs,
+                    const RetransmissionInfo& rhs) const {
       DCHECK(lhs.scheduled_time.IsInitialized() &&
              rhs.scheduled_time.IsInitialized());
       return lhs.scheduled_time > rhs.scheduled_time;
     }
   };
 
   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>
+  typedef std::priority_queue<RetransmissionInfo,
+                              std::vector<RetransmissionInfo>,
+                              RetransmissionInfoComparator>
       RetransmissionTimeouts;
 
   // 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 QuicTagVector& available_versions);
   // Sends a version negotiation packet to the peer.
   void SendVersionNegotiationPacket();
 
-  void SetupRetransmission(QuicPacketSequenceNumber sequence_number);
+  void MaybeSetupRetransmission(QuicPacketSequenceNumber sequence_number);
   bool IsRetransmission(QuicPacketSequenceNumber sequence_number);
 
-  void SetupAbandonFecTimer(QuicPacketSequenceNumber sequence_number);
-
   // Drop packet corresponding to |sequence_number| by deleting entries from
   // |unacked_packets_| and |retransmission_map_|, if present. We need to drop
   // all packets with encryption level NONE after the default level has been set
   // to FORWARD_SECURE.
   void DropPacket(QuicPacketSequenceNumber sequence_number);
 
   // Writes as many queued packets as possible.  The connection must not be
   // blocked when this is called.
   bool WriteQueuedPackets();
 
   // If a packet can be revived from the current FEC group, then
   // revive and process the packet.
   void MaybeProcessRevivedPacket();
 
-  void HandleAckForSentPackets(const QuicAckFrame& incoming_ack,
-                               SequenceNumberSet* acked_packets);
-  void HandleAckForSentFecPackets(const QuicAckFrame& incoming_ack,
-                                  SequenceNumberSet* acked_packets);
-
-  // These two are called by OnAckFrame.
-  //
-  // Updates internal state based on incoming_ack.received_info
-  void UpdatePacketInformationReceivedByPeer(
-      const QuicAckFrame& incoming_ack);
-  // Updates internal state based on incoming_ack.sent_info
-  void UpdatePacketInformationSentByPeer(const QuicAckFrame& incoming_ack);
-
   void UpdateOutgoingAck();
 
   void MaybeSendAckInResponseToPacket();
 
-  void MaybeAbandonFecPacket(QuicPacketSequenceNumber sequence_number);
-
   // Get the FEC group associate with the last processed packet or NULL, if the
   // group has already been deleted.
   QuicFecGroup* GetFecGroup();
 
   // Closes any FEC groups protecting packets before |sequence_number|.
   void CloseFecGroupsBefore(QuicPacketSequenceNumber sequence_number);
 
   scoped_ptr<QuicConnectionHelperInterface> helper_;
   EncryptionLevel encryption_level_;
   const QuicClock* clock_;
@@ skipping 22 matching lines @@
   // Least sequence number which the peer is still waiting for.
   QuicPacketSequenceNumber least_packet_awaited_by_peer_;
   // Least sequence number of the the packet sent by the peer for which it
   // hasn't received an ack.
   QuicPacketSequenceNumber peer_least_packet_awaiting_ack_;
 
   // When new packets are created which may be retransmitted, they are added
   // to this map, which contains owning pointers to the contained frames.
   UnackedPacketMap unacked_packets_;
 
-  // Pending fec packets that have not been acked yet. These packets need to be
-  // cleared out of the cgst_window after a timeout since FEC packets are never
-  // retransmitted.
-  // Ask: What should be the timeout for these packets?
-  UnackedPacketMap unacked_fec_packets_;
-
   // Heap of packets that we might need to retransmit, and the time at
   // which we should retransmit them. Every time a packet is sent it is added
   // to this heap which is O(log(number of pending packets to be retransmitted))
   // which might be costly. This should be optimized to O(1) by maintaining a
   // priority queue of lists of packets to be retransmitted, where list x
   // contains all packets that have been retransmitted x times.
   RetransmissionTimeouts retransmission_timeouts_;
 
   // Map from sequence number to the retransmission info.
   RetransmissionMap retransmission_map_;
@@ skipping 66 matching lines @@
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicConnection);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONNECTION_H_