| Index: net/quic/core/quic_framer.cc
|
| diff --git a/net/quic/core/quic_framer.cc b/net/quic/core/quic_framer.cc
|
| index 2c9f6320bb38942b9a7ecb9eac9d6f836ae0510c..e36edde9d783c6b9b094fed9c4b7aa7975093a73 100644
|
| --- a/net/quic/core/quic_framer.cc
|
| +++ b/net/quic/core/quic_framer.cc
|
| @@ -136,7 +136,6 @@ QuicFramer::QuicFramer(const QuicVersionVector& supported_versions,
|
| error_(QUIC_NO_ERROR),
|
| last_packet_number_(0),
|
| largest_packet_number_(0),
|
| - last_path_id_(kInvalidPathId),
|
| last_serialized_connection_id_(0),
|
| supported_versions_(supported_versions),
|
| decrypter_level_(ENCRYPTION_NONE),
|
| @@ -743,46 +742,12 @@ const QuicTime::Delta QuicFramer::CalculateTimestampFromWire(
|
| return QuicTime::Delta::FromMicroseconds(time);
|
| }
|
|
|
| -bool QuicFramer::IsValidPath(QuicPathId path_id,
|
| - QuicPacketNumber* base_packet_number) {
|
| - if (QuicContainsKey(closed_paths_, path_id)) {
|
| - // Path is closed.
|
| - return false;
|
| - }
|
| -
|
| - if (path_id == last_path_id_) {
|
| - *base_packet_number = largest_packet_number_;
|
| - return true;
|
| - }
|
| -
|
| - if (QuicContainsKey(largest_packet_numbers_, path_id)) {
|
| - *base_packet_number = largest_packet_numbers_[path_id];
|
| - } else {
|
| - *base_packet_number = 0;
|
| - }
|
| -
|
| - return true;
|
| -}
|
| -
|
| void QuicFramer::SetLastPacketNumber(const QuicPacketHeader& header) {
|
| - if (header.public_header.multipath_flag && header.path_id != last_path_id_) {
|
| - if (last_path_id_ != kInvalidPathId) {
|
| - // Save current last packet number before changing path.
|
| - largest_packet_numbers_[last_path_id_] = largest_packet_number_;
|
| - }
|
| - // Change path.
|
| - last_path_id_ = header.path_id;
|
| - }
|
| last_packet_number_ = header.packet_number;
|
| largest_packet_number_ =
|
| std::max(header.packet_number, largest_packet_number_);
|
| }
|
|
|
| -void QuicFramer::OnPathClosed(QuicPathId path_id) {
|
| - closed_paths_.insert(path_id);
|
| - largest_packet_numbers_.erase(path_id);
|
| -}
|
| -
|
| QuicPacketNumber QuicFramer::CalculatePacketNumberFromWire(
|
| QuicPacketNumberLength packet_number_length,
|
| QuicPacketNumber base_packet_number,
|
| @@ -964,12 +929,6 @@ bool QuicFramer::ProcessUnauthenticatedHeader(QuicDataReader* encrypted_reader,
|
| }
|
|
|
| QuicPacketNumber base_packet_number = largest_packet_number_;
|
| - if (header->public_header.multipath_flag &&
|
| - !IsValidPath(header->path_id, &base_packet_number)) {
|
| - // Stop processing because path is closed.
|
| - set_detailed_error("Path is closed.");
|
| - return false;
|
| - }
|
|
|
| if (!ProcessPacketSequenceNumber(
|
| encrypted_reader, header->public_header.packet_number_length,
|
|
|