Landing Recent QUIC changes until 2/12/2016 21:32 UTC

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 <algorithm>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 386 matching lines @@
     buffer += copy_len;
     if (length == 0 || ++iovnum >= iov.iov_count) {
       break;
     }
     src = static_cast<char*>(iov.iov[iovnum].iov_base);
     copy_len = min(length, iov.iov[iovnum].iov_len);
   }
   QUIC_BUG_IF(length > 0) << "Failed to copy entire length to buffer.";
 }
 
-SerializedPacket QuicPacketCreator::ReserializeAllFrames(
+void QuicPacketCreator::ReserializeAllFrames(
     const PendingRetransmission& retransmission,
     char* buffer,
     size_t buffer_len) {
   DCHECK(queued_frames_.empty());
   DCHECK(fec_group_.get() == nullptr);
   DCHECK(!packet_.needs_padding);
   QUIC_BUG_IF(retransmission.retransmittable_frames.empty())
       << "Attempt to serialize empty packet";
   const QuicPacketNumberLength saved_length = packet_.packet_number_length;
   const QuicPacketNumberLength saved_next_length = next_packet_number_length_;
   const bool saved_should_fec_protect = fec_protect_;
-  const bool saved_needs_padding = packet_.needs_padding;
   const EncryptionLevel default_encryption_level = packet_.encryption_level;
 
   // Temporarily set the packet number length, stop FEC protection,
   // and change the encryption level.
   packet_.packet_number_length = retransmission.packet_number_length;
   next_packet_number_length_ = retransmission.packet_number_length;
   fec_protect_ = false;
   packet_.needs_padding = retransmission.needs_padding;
   // Only preserve the original encryption level if it's a handshake packet or
   // if we haven't gone forward secure.
   if (retransmission.has_crypto_handshake ||
       packet_.encryption_level != ENCRYPTION_FORWARD_SECURE) {
     packet_.encryption_level = retransmission.encryption_level;
   }
 
   // Serialize the packet and restore the FEC and packet number length state.
   for (const QuicFrame& frame : retransmission.retransmittable_frames) {
     bool success = AddFrame(frame, false);
     DCHECK(success);
   }
   SerializePacket(buffer, buffer_len);
-  if (FLAGS_quic_retransmit_via_onserializedpacket) {
-    packet_.original_packet_number = retransmission.packet_number;
-    packet_.transmission_type = retransmission.transmission_type;
-    OnSerializedPacket();
-    // Restore old values.
-    packet_.packet_number_length = saved_length;
-    next_packet_number_length_ = saved_next_length;
-    fec_protect_ = saved_should_fec_protect;
-    packet_.encryption_level = default_encryption_level;
-    return NoPacket();
-  } else {
-    SerializedPacket packet_copy = packet_;
-    ClearPacket();
-    // Restore old values.
-    packet_.needs_padding = saved_needs_padding;
-    packet_.packet_number_length = saved_length;
-    next_packet_number_length_ = saved_next_length;
-    fec_protect_ = saved_should_fec_protect;
-    packet_.encryption_level = default_encryption_level;
-    return packet_copy;
-  }
+  packet_.original_packet_number = retransmission.packet_number;
+  packet_.transmission_type = retransmission.transmission_type;
+  OnSerializedPacket();
+  // Restore old values.
+  packet_.packet_number_length = saved_length;
+  next_packet_number_length_ = saved_next_length;
+  fec_protect_ = saved_should_fec_protect;
+  packet_.encryption_level = default_encryption_level;
 }
 
 void QuicPacketCreator::Flush() {
   if (!HasPendingFrames()) {
     return;
   }
 
   // TODO(rtenneti): Change the default 64 alignas value (used the default
   // value from CACHELINE_SIZE).
   ALIGNAS(64) char seralized_packet_buffer[kMaxPacketSize];
@@ skipping 386 matching lines @@
   packet_.packet_number = it == multipath_packet_number_.end() ? 0 : it->second;
   packet_.path_id = path_id;
   DCHECK(packet_.path_id != kInvalidPathId);
   // Send path in packet if current path is not the default path.
   send_path_id_in_packet_ = packet_.path_id != kDefaultPathId ? true : false;
   // Switching path needs to update packet number length.
   UpdatePacketNumberLength(least_packet_awaited_by_peer, max_packets_in_flight);
 }
 
 }  // namespace net