| Index: net/quic/core/quic_framer.h
|
| diff --git a/net/quic/core/quic_framer.h b/net/quic/core/quic_framer.h
|
| index 6cb85229ad04d795cc823e19f5d1de9f4bcf7006..c8e1ba2a0d5a5e7f6599d76692aec2a1c385753c 100644
|
| --- a/net/quic/core/quic_framer.h
|
| +++ b/net/quic/core/quic_framer.h
|
| @@ -312,7 +312,7 @@ class QUIC_EXPORT_PRIVATE QuicFramer {
|
| const std::string& detailed_error() { return detailed_error_; }
|
|
|
| // The minimum packet number length required to represent |packet_number|.
|
| - static QuicPacketNumberLength GetMinSequenceNumberLength(
|
| + static QuicPacketNumberLength GetMinPacketNumberLength(
|
| QuicPacketNumber packet_number);
|
|
|
| void SetSupportedVersions(const QuicVersionVector& versions) {
|
| @@ -364,10 +364,14 @@ class QUIC_EXPORT_PRIVATE QuicFramer {
|
| bool ProcessUnauthenticatedHeader(QuicDataReader* encrypted_reader,
|
| QuicPacketHeader* header);
|
|
|
| - bool ProcessPacketSequenceNumber(QuicDataReader* reader,
|
| - QuicPacketNumberLength packet_number_length,
|
| - QuicPacketNumber base_packet_number,
|
| - QuicPacketNumber* packet_number);
|
| + // First processes possibly truncated packet number. Calculates the full
|
| + // packet number from the truncated one and the last seen packet number, and
|
| + // stores it to |packet_number|.
|
| + bool ProcessAndCalculatePacketNumber(
|
| + QuicDataReader* reader,
|
| + QuicPacketNumberLength packet_number_length,
|
| + QuicPacketNumber base_packet_number,
|
| + QuicPacketNumber* packet_number);
|
| bool ProcessFrameData(QuicDataReader* reader, const QuicPacketHeader& header);
|
| bool ProcessStreamFrame(QuicDataReader* reader,
|
| uint8_t frame_type,
|
| @@ -425,10 +429,15 @@ class QUIC_EXPORT_PRIVATE QuicFramer {
|
| bool last_frame_in_packet,
|
| QuicPacketNumberLength packet_number_length);
|
|
|
| - static bool AppendPacketSequenceNumber(
|
| - QuicPacketNumberLength packet_number_length,
|
| - QuicPacketNumber packet_number,
|
| - QuicDataWriter* writer);
|
| + static bool AppendPacketNumber(QuicPacketNumberLength packet_number_length,
|
| + QuicPacketNumber packet_number,
|
| + QuicDataWriter* writer);
|
| + static bool AppendStreamId(size_t stream_id_length,
|
| + QuicStreamId stream_id,
|
| + QuicDataWriter* writer);
|
| + static bool AppendStreamOffset(size_t offset_length,
|
| + QuicStreamOffset offset,
|
| + QuicDataWriter* writer);
|
|
|
| // Appends a single ACK block to |writer| and returns true if the block was
|
| // successfully appended.
|
| @@ -437,7 +446,7 @@ class QUIC_EXPORT_PRIVATE QuicFramer {
|
| QuicPacketNumber length,
|
| QuicDataWriter* writer);
|
|
|
| - static uint8_t GetSequenceNumberFlags(
|
| + static uint8_t GetPacketNumberFlags(
|
| QuicPacketNumberLength packet_number_length);
|
|
|
| static AckFrameInfo GetAckFrameInfo(const QuicAckFrame& frame);
|
|
|