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

Unified Diff: net/quic/quic_protocol.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_protocol.h ('k') | net/quic/test_tools/quic_packet_creator_peer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_protocol.cc
diff --git a/net/quic/quic_protocol.cc b/net/quic/quic_protocol.cc
index 9b3ebcb6640a30275d0ae0121362928e40b235ea..6705a762d302e1956360de9fb34b20effaec6fae 100644
--- a/net/quic/quic_protocol.cc
+++ b/net/quic/quic_protocol.cc
@@ -798,6 +798,7 @@ SerializedPacket::SerializedPacket(
retransmittable_frames(retransmittable_frames),
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),
@@ -812,7 +813,8 @@ SerializedPacket::SerializedPacket(
QuicPacketEntropyHash entropy_hash,
RetransmittableFrames* retransmittable_frames,
bool has_ack,
- bool has_stop_waiting)
+ bool has_stop_waiting,
+ EncryptionLevel level)
: SerializedPacket(packet_number,
packet_number_length,
new QuicEncryptedPacket(encrypted_buffer,
@@ -821,7 +823,11 @@ SerializedPacket::SerializedPacket(
entropy_hash,
retransmittable_frames,
has_ack,
- has_stop_waiting) {}
+ has_stop_waiting) {
+ // TODO(ianswett): Move into the initializer list once SerializedPacket
+ // no longer contains an encrypted packet.
+ encryption_level = level;
+}
SerializedPacket::~SerializedPacket() {}
« no previous file with comments | « net/quic/quic_protocol.h ('k') | net/quic/test_tools/quic_packet_creator_peer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698