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

net/quic/quic_packet_creator.cc

 // 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.
 
 #include "net/quic/quic_packet_creator.h"
 
 #include "base/logging.h"
 #include "net/quic/quic_utils.h"
 //#include "util/random/acmrandom.h"
 
@@ skipping 63 matching lines @@
       StringPiece data_frame(data.data() + data.size() - data_to_send,
                                 frame_len);
 
       QuicStreamFrame frame(id, set_fin, offset, data_frame);
       frames.push_back(QuicFrame(&frame));
       FillPacketHeader(current_fec_group, PACKET_FLAGS_NONE, &header);
       offset += frame_len;
       data_to_send -= frame_len;
 
       // Produce the data packet (which might fin the stream).
-      framer_->ConstructFragementDataPacket(header, frames, &packet);
+      framer_->ConstructFrameDataPacket(header, frames, &packet);
       DCHECK_GE(options_.max_packet_length, packet->length());
       packets->push_back(make_pair(header.packet_sequence_number, packet));
       frames.clear();
     }
   }
 
   // Create a new packet for the fin, if necessary.
   if (fin && (options_.separate_fin_packet || data.size() == 0)) {
     FillPacketHeader(current_fec_group, PACKET_FLAGS_NONE, &header);
     QuicStreamFrame frame(id, true, offset, "");
     frames.push_back(QuicFrame(&frame));
-    framer_->ConstructFragementDataPacket(header, frames, &packet);
+    framer_->ConstructFrameDataPacket(header, frames, &packet);
     packets->push_back(make_pair(header.packet_sequence_number, packet));
     frames.clear();
   }
 
   // Create a new FEC packet, if necessary
   if (current_fec_group != 0) {
     FillPacketHeader(current_fec_group, PACKET_FLAGS_FEC, &header);
     fec_data.redundancy = fec_group_->parity();
     QuicPacket* fec_packet;
     framer_->ConstructFecPacket(header, fec_data, &fec_packet);
@@ skipping 24 matching lines @@
     QuicStreamOffset offset,
     QuicErrorCode error) {
   QuicPacketHeader header;
   FillPacketHeader(0, PACKET_FLAGS_NONE, &header);
 
   QuicRstStreamFrame close_frame(id, offset, error);
 
   QuicPacket* packet;
   QuicFrames frames;
   frames.push_back(QuicFrame(&close_frame));
-  framer_->ConstructFragementDataPacket(header, frames, &packet);
+  framer_->ConstructFrameDataPacket(header, frames, &packet);
   return make_pair(header.packet_sequence_number, packet);
 }
 
 QuicPacketCreator::PacketPair QuicPacketCreator::CloseConnection(
     QuicConnectionCloseFrame* close_frame) {
 
   QuicPacketHeader header;
   FillPacketHeader(0, PACKET_FLAGS_NONE, &header);
 
   QuicPacket* packet;
   QuicFrames frames;
   frames.push_back(QuicFrame(close_frame));
-  framer_->ConstructFragementDataPacket(header, frames, &packet);
+  framer_->ConstructFrameDataPacket(header, frames, &packet);
   return make_pair(header.packet_sequence_number, packet);
 }
 
 QuicPacketCreator::PacketPair QuicPacketCreator::AckPacket(
     QuicAckFrame* ack_frame) {
 
   QuicPacketHeader header;
   FillPacketHeader(0, PACKET_FLAGS_NONE, &header);
 
   QuicPacket* packet;
   QuicFrames frames;
   frames.push_back(QuicFrame(ack_frame));
-  framer_->ConstructFragementDataPacket(header, frames, &packet);
+  framer_->ConstructFrameDataPacket(header, frames, &packet);
   return make_pair(header.packet_sequence_number, packet);
 }
 
+QuicPacketSequenceNumber QuicPacketCreator::SetNewSequenceNumber(
+    QuicPacket* packet) {
+  ++sequence_number_;
+  framer_->WriteSequenceNumber(sequence_number_, packet);
+  return sequence_number_;
+}
+
 void QuicPacketCreator::FillPacketHeader(QuicFecGroupNumber fec_group,
                                          QuicPacketFlags flags,
                                          QuicPacketHeader* header) {
   header->guid = guid_;
   header->flags = flags;
   header->packet_sequence_number = ++sequence_number_;
   header->fec_group = fec_group;
 
-  // Default to zero - the sender should increment this as packets are
-  // retransmitted.
-  header->retransmission_count = 0;
   header->transmission_time = 0;
 }
 
 }  // namespace net