Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Unified Diff: net/quic/quic_packet_creator.cc

Issue 1502503002: Move encryption_level from QueuedPacket into SerializedPacket. No functional change. Not flag pro… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@108718393
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_packet_creator_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_packet_creator.cc
diff --git a/net/quic/quic_packet_creator.cc b/net/quic/quic_packet_creator.cc
index c0a69937830c40de5dd78eefb2fdfa6a16c011ee..98eb12197f6f91474622d7f8a966d50a7b612942 100644
--- a/net/quic/quic_packet_creator.cc
+++ b/net/quic/quic_packet_creator.cc
@@ -600,7 +600,8 @@ SerializedPacket QuicPacketCreator::SerializePacket(
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);
+ queued_retransmittable_frames_.release(), has_ack, has_stop_waiting,
+ encryption_level_);
}
SerializedPacket QuicPacketCreator::SerializeFec(char* buffer,
@@ -630,10 +631,11 @@ SerializedPacket QuicPacketCreator::SerializeFec(char* buffer,
LOG(DFATAL) << "Failed to encrypt packet number " << packet_number_;
return NoPacket();
}
- SerializedPacket serialized(
- header.packet_number, header.public_header.packet_number_length, buffer,
- encrypted_length, /* owns_buffer */ false,
- QuicFramer::GetPacketEntropyHash(header), nullptr, false, false);
+ SerializedPacket serialized(header.packet_number,
+ header.public_header.packet_number_length, buffer,
+ encrypted_length, /* owns_buffer */ false,
+ QuicFramer::GetPacketEntropyHash(header), nullptr,
+ false, false, encryption_level_);
serialized.is_fec_packet = true;
return serialized;
}
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_packet_creator_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698