| Index: net/quic/quic_packet_creator.cc
|
| diff --git a/net/quic/quic_packet_creator.cc b/net/quic/quic_packet_creator.cc
|
| index 6c2dd3eff88ea52e0493f7e8b794df218acfcb12..73929818bc5e2687174b9c71c9604f2d1125de8a 100644
|
| --- a/net/quic/quic_packet_creator.cc
|
| +++ b/net/quic/quic_packet_creator.cc
|
| @@ -648,12 +648,13 @@ SerializedPacket QuicPacketCreator::SerializePacket(
|
| packet_size_ = 0;
|
| queued_frames_.clear();
|
| needs_padding_ = false;
|
| - return SerializedPacket(
|
| - header.packet_number, header.public_header.packet_number_length,
|
| - encrypted_buffer, encrypted_length, /* owns_buffer*/ false,
|
| - QuicFramer::GetPacketEntropyHash(header),
|
| - queued_retransmittable_frames_.release(), has_ack_, has_stop_waiting_,
|
| - encryption_level_);
|
| + return SerializedPacket(current_path_, header.packet_number,
|
| + header.public_header.packet_number_length,
|
| + encrypted_buffer, encrypted_length,
|
| + /* owns_buffer*/ false,
|
| + QuicFramer::GetPacketEntropyHash(header),
|
| + queued_retransmittable_frames_.release(), has_ack_,
|
| + has_stop_waiting_, encryption_level_);
|
| }
|
|
|
| SerializedPacket QuicPacketCreator::SerializeFec(char* buffer,
|
| @@ -683,7 +684,7 @@ SerializedPacket QuicPacketCreator::SerializeFec(char* buffer,
|
| LOG(DFATAL) << "Failed to encrypt packet number " << packet_number_;
|
| return NoPacket();
|
| }
|
| - SerializedPacket serialized(header.packet_number,
|
| + SerializedPacket serialized(current_path_, header.packet_number,
|
| header.public_header.packet_number_length, buffer,
|
| encrypted_length, /* owns_buffer */ false,
|
| QuicFramer::GetPacketEntropyHash(header), nullptr,
|
| @@ -703,8 +704,8 @@ QuicEncryptedPacket* QuicPacketCreator::SerializeVersionNegotiationPacket(
|
| }
|
|
|
| SerializedPacket QuicPacketCreator::NoPacket() {
|
| - return SerializedPacket(0, PACKET_1BYTE_PACKET_NUMBER, nullptr, 0, nullptr,
|
| - false, false);
|
| + return SerializedPacket(kInvalidPathId, 0, PACKET_1BYTE_PACKET_NUMBER,
|
| + nullptr, 0, nullptr, false, false);
|
| }
|
|
|
| void QuicPacketCreator::FillPacketHeader(QuicFecGroupNumber fec_group,
|
|
|