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

net/quic/quic_connection.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_connection.h"
 
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 1493 matching lines @@
 
     // Re-packetize the frames with a new packet number for retransmission.
     // Retransmitted data packets do not use FEC, even when it's enabled.
     // Retransmitted packets use the same packet number length as the
     // original.
     // Flush the packet generator before making a new packet.
     // TODO(ianswett): Implement ReserializeAllFrames as a separate path that
     // does not require the creator to be flushed.
     packet_generator_.FlushAllQueuedFrames();
     char buffer[kMaxPacketSize];
-    SerializedPacket serialized_packet =
-        packet_generator_.ReserializeAllFrames(pending, buffer, kMaxPacketSize);
-    if (FLAGS_quic_retransmit_via_onserializedpacket) {
-      DCHECK(serialized_packet.encrypted_buffer == nullptr);
-      continue;
-    }
-    if (serialized_packet.encrypted_buffer == nullptr) {
-      // We failed to serialize the packet, so close the connection.
-      // CloseConnection does not send close packet, so no infinite loop here.
-      // TODO(ianswett): This is actually an internal error, not an encryption
-      // failure.
-      CloseConnection(QUIC_ENCRYPTION_FAILURE,
-                      ConnectionCloseSource::FROM_SELF);
-      return;
-    }
-
-    DVLOG(1) << ENDPOINT << "Retransmitting " << pending.packet_number << " as "
-             << serialized_packet.packet_number;
-    serialized_packet.original_packet_number = pending.packet_number;
-    serialized_packet.transmission_type = pending.transmission_type;
-    SendOrQueuePacket(&serialized_packet);
+    packet_generator_.ReserializeAllFrames(pending, buffer, kMaxPacketSize);
   }
 }
 
 void QuicConnection::RetransmitUnackedPackets(
     TransmissionType retransmission_type) {
   sent_packet_manager_.RetransmitUnackedPackets(retransmission_type);
 
   WriteIfNotBlocked();
 }
 
@@ skipping 986 matching lines @@
 void QuicConnection::OnPathClosed(QuicPathId path_id) {
   // Stop receiving packets on this path.
   framer_.OnPathClosed(path_id);
 }
 
 bool QuicConnection::ack_frame_updated() const {
   return received_packet_manager_.ack_frame_updated();
 }
 
 }  // namespace net