Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/quic/chromium/quic_test_packet_maker.h" | 5 #include "net/quic/chromium/quic_test_packet_maker.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 return MakeAckPacket(packet_number, largest_received, least_unacked, | 221 return MakeAckPacket(packet_number, largest_received, least_unacked, |
| 222 least_unacked, send_feedback); | 222 least_unacked, send_feedback); |
| 223 } | 223 } |
| 224 | 224 |
| 225 std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket( | 225 std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket( |
| 226 QuicPacketNumber packet_number, | 226 QuicPacketNumber packet_number, |
| 227 QuicPacketNumber largest_received, | 227 QuicPacketNumber largest_received, |
| 228 QuicPacketNumber ack_least_unacked, | 228 QuicPacketNumber ack_least_unacked, |
| 229 QuicPacketNumber stop_least_unacked, | 229 QuicPacketNumber stop_least_unacked, |
| 230 bool send_feedback) { | 230 bool send_feedback) { |
| 231 return MakeAckPacket(packet_number, largest_received, ack_least_unacked, | |
| 232 stop_least_unacked, send_feedback, | |
| 233 QuicTime::Delta::Zero()); | |
| 234 } | |
| 235 | |
| 236 std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket( | |
| 237 QuicPacketNumber packet_number, | |
| 238 QuicPacketNumber largest_received, | |
| 239 QuicPacketNumber ack_least_unacked, | |
| 240 QuicPacketNumber stop_least_unacked, | |
| 241 bool send_feedback, | |
| 242 QuicTime::Delta ack_delay_time) { | |
| 231 QuicPacketHeader header; | 243 QuicPacketHeader header; |
| 232 header.public_header.connection_id = connection_id_; | 244 header.public_header.connection_id = connection_id_; |
| 233 header.public_header.reset_flag = false; | 245 header.public_header.reset_flag = false; |
| 234 header.public_header.version_flag = false; | 246 header.public_header.version_flag = false; |
| 235 header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER; | 247 header.public_header.packet_number_length = PACKET_1BYTE_PACKET_NUMBER; |
| 236 header.packet_number = packet_number; | 248 header.packet_number = packet_number; |
| 237 | 249 |
| 238 QuicAckFrame ack(MakeAckFrame(largest_received)); | 250 QuicAckFrame ack(MakeAckFrame(largest_received)); |
| 239 ack.ack_delay_time = QuicTime::Delta::Zero(); | 251 ack.ack_delay_time = ack_delay_time; |
|
Jana
2017/04/06 02:29:18
why this change?
Ryan Hamilton
2017/04/06 03:43:39
This isn't a change in behavior so much as it is a
| |
| 240 for (QuicPacketNumber i = ack_least_unacked; i <= largest_received; ++i) { | 252 for (QuicPacketNumber i = ack_least_unacked; i <= largest_received; ++i) { |
| 241 ack.received_packet_times.push_back(std::make_pair(i, clock_->Now())); | 253 ack.received_packet_times.push_back(std::make_pair(i, clock_->Now())); |
| 242 } | 254 } |
| 243 if (largest_received > 0) { | 255 if (largest_received > 0) { |
| 244 ack.packets.Add(1, largest_received + 1); | 256 ack.packets.Add(1, largest_received + 1); |
| 245 } | 257 } |
| 246 | 258 |
| 247 QuicFramer framer(SupportedVersions(version_), clock_->Now(), perspective_); | 259 QuicFramer framer(SupportedVersions(version_), clock_->Now(), perspective_); |
| 248 QuicFrames frames; | 260 QuicFrames frames; |
| 249 QuicFrame ack_frame(&ack); | 261 QuicFrame ack_frame(&ack); |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 682 return MakePacket(header_, QuicFrame(&quic_frame)); | 694 return MakePacket(header_, QuicFrame(&quic_frame)); |
| 683 } | 695 } |
| 684 QuicStreamFrame quic_frame( | 696 QuicStreamFrame quic_frame( |
| 685 kHeadersStreamId, false, 0, | 697 kHeadersStreamId, false, 0, |
| 686 QuicStringPiece(spdy_frame.data(), spdy_frame.size())); | 698 QuicStringPiece(spdy_frame.data(), spdy_frame.size())); |
| 687 return MakePacket(header_, QuicFrame(&quic_frame)); | 699 return MakePacket(header_, QuicFrame(&quic_frame)); |
| 688 } | 700 } |
| 689 | 701 |
| 690 } // namespace test | 702 } // namespace test |
| 691 } // namespace net | 703 } // namespace net |
| OLD | NEW |