Change from re-transmitting an packet with a retransmit number to sending a new packet with a new s…

net/quic/quic_framer.cc

Index: net/quic/quic_framer.cc
diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
index 0148783a0c010ee094d33f7ea9aa6bb131f1b5f8..ab47407f325e09f49102a24557152036e3078129 100644
--- a/net/quic/quic_framer.cc
+++ b/net/quic/quic_framer.cc
@@ -26,7 +26,7 @@ QuicFramer::QuicFramer(QuicDecrypter* decrypter, QuicEncrypter* encrypter)
 
 QuicFramer::~QuicFramer() {}
 
-bool QuicFramer::ConstructFragementDataPacket(
+bool QuicFramer::ConstructFrameDataPacket(
     const QuicPacketHeader& header,
     const QuicFrames& frames,
     QuicPacket** packet) {
@@ -89,8 +89,9 @@ bool QuicFramer::ConstructFragementDataPacket(
         return RaiseError(QUIC_INVALID_FRAME_DATA);
     }
   }
+
   DCHECK_EQ(len, writer.length());
-  *packet = new QuicPacket(writer.take(), len, true);
+  *packet = new QuicPacket(writer.take(), len, true, PACKET_FLAGS_NONE);
   if (fec_builder_) {
     fec_builder_->OnBuiltFecProtectedPayload(header,
                                              (*packet)->FecProtectedData());
@@ -122,23 +123,11 @@ bool QuicFramer::ConstructFecPacket(const QuicPacketHeader& header,
     return false;
   }
 
-  *packet = new QuicPacket(writer.take(), len, true);
+  *packet = new QuicPacket(writer.take(), len, true, PACKET_FLAGS_FEC);
 
   return true;
 }
 
-void QuicFramer::IncrementRetransmitCount(QuicPacket* packet) {
-  CHECK_GT(packet->length(), kPacketHeaderSize);
-
-  ++packet->mutable_data()[kRetransmissionOffset];
-}
-
-uint8 QuicFramer::GetRetransmitCount(QuicPacket* packet) {
-  CHECK_GT(packet->length(), kPacketHeaderSize);
-
-  return packet->mutable_data()[kRetransmissionOffset];
-}
-
 bool QuicFramer::ProcessPacket(const IPEndPoint& self_address,
                                const IPEndPoint& peer_address,
                                const QuicEncryptedPacket& packet) {
@@ -228,10 +217,6 @@ bool QuicFramer::WritePacketHeader(const QuicPacketHeader& header,
     return false;
   }
 
-  if (!writer->WriteBytes(&header.retransmission_count, 1)) {
-    return false;
-  }
-
   // CongestionMonitoredHeader
   if (!writer->WriteUInt64(header.transmission_time)) {
     return false;
@@ -262,11 +247,6 @@ bool QuicFramer::ProcessPacketHeader(QuicPacketHeader* header,
     return false;
   }
 
-  if (!reader_->ReadBytes(&header->retransmission_count, 1)) {
-    set_detailed_error("Unable to read retransmission count.");
-    return false;
-  }
-
   // CongestionMonitoredHeader
   if (!reader_->ReadUInt64(&header->transmission_time)) {
     set_detailed_error("Unable to read transmission time.");
@@ -557,6 +537,18 @@ void QuicFramer::WriteTransmissionTime(QuicTransmissionTime time,
       time, packet->mutable_data() + kTransmissionTimeOffset);
 }
 
+void QuicFramer::WriteSequenceNumber(QuicPacketSequenceNumber sequence_number,
+                                     QuicPacket* packet) {
+  QuicDataWriter::WriteUint48ToBuffer(
+      sequence_number, packet->mutable_data() + kSequenceNumberOffset);
+}
+
+void QuicFramer::WriteFecGroup(QuicFecGroupNumber fec_group,
+                               QuicPacket* packet) {
+  QuicDataWriter::WriteUint8ToBuffer(
+      fec_group, packet->mutable_data() + kFecGroupOffset);
+}
+
 QuicEncryptedPacket* QuicFramer::EncryptPacket(const QuicPacket& packet) {
   scoped_ptr<QuicData> out(encrypter_->Encrypt(packet.AssociatedData(),
                                                packet.Plaintext()));