Landing Recent QUIC changes until 12/18/2015 13:57 UTC

net/quic/quic_protocol.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_protocol.h"
 
 #include "base/stl_util.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 
@@ skipping 750 matching lines @@
 
 AckListenerWrapper::AckListenerWrapper(QuicAckListenerInterface* listener,
                                        QuicPacketLength data_length)
     : ack_listener(listener), length(data_length) {
   DCHECK(listener != nullptr);
 }
 
 AckListenerWrapper::~AckListenerWrapper() {}
 
 SerializedPacket::SerializedPacket(
+    QuicPathId path_id,
     QuicPacketNumber packet_number,
     QuicPacketNumberLength packet_number_length,
     QuicEncryptedPacket* packet,
     QuicPacketEntropyHash entropy_hash,
     RetransmittableFrames* retransmittable_frames,
     bool has_ack,
     bool has_stop_waiting)
     : packet(packet),
       retransmittable_frames(retransmittable_frames),
+      path_id(path_id),
       packet_number(packet_number),
       packet_number_length(packet_number_length),
       encryption_level(ENCRYPTION_NONE),
       entropy_hash(entropy_hash),
       is_fec_packet(false),
       has_ack(has_ack),
       has_stop_waiting(has_stop_waiting) {}
 
 SerializedPacket::SerializedPacket(
+    QuicPathId path_id,
     QuicPacketNumber packet_number,
     QuicPacketNumberLength packet_number_length,
     char* encrypted_buffer,
     size_t encrypted_length,
     bool owns_buffer,
     QuicPacketEntropyHash entropy_hash,
     RetransmittableFrames* retransmittable_frames,
     bool has_ack,
     bool has_stop_waiting,
     EncryptionLevel level)
-    : SerializedPacket(packet_number,
+    : SerializedPacket(path_id,
+                       packet_number,
                        packet_number_length,
                        new QuicEncryptedPacket(encrypted_buffer,
                                                encrypted_length,
                                                owns_buffer),
                        entropy_hash,
                        retransmittable_frames,
                        has_ack,
                        has_stop_waiting) {
   // TODO(ianswett): Move into the initializer list once SerializedPacket
   // no longer contains an encrypted packet.
@@ skipping 44 matching lines @@
       transmission_type(transmission_type),
       in_flight(false),
       is_unackable(false),
       is_fec_packet(is_fec_packet),
       all_transmissions(nullptr),
       retransmission(0) {}
 
 TransmissionInfo::~TransmissionInfo() {}
 
 }  // namespace net