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

Side by Side Diff: net/quic/quic_utils.cc

Issue 1666553002: Make QUIC's SerializedPacket contain QuicFrames, rather than a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@113205205
Patch Set: Created 4 years, 10 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/quic_utils.h" 5 #include "net/quic/quic_utils.h"
6 6
7 #include <ctype.h> 7 #include <ctype.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 ++it; 448 ++it;
449 continue; 449 continue;
450 } 450 }
451 delete it->stream_frame; 451 delete it->stream_frame;
452 it = frames->erase(it); 452 it = frames->erase(it);
453 } 453 }
454 } 454 }
455 455
456 // static 456 // static
457 void QuicUtils::ClearSerializedPacket(SerializedPacket* serialized_packet) { 457 void QuicUtils::ClearSerializedPacket(SerializedPacket* serialized_packet) {
458 if (serialized_packet->retransmittable_frames != nullptr) { 458 if (!serialized_packet->retransmittable_frames.empty()) {
459 DeleteFrames(serialized_packet->retransmittable_frames); 459 DeleteFrames(&serialized_packet->retransmittable_frames);
460 } 460 }
461 delete serialized_packet->retransmittable_frames;
462 delete serialized_packet->packet; 461 delete serialized_packet->packet;
463 serialized_packet->retransmittable_frames = nullptr;
464 serialized_packet->packet = nullptr; 462 serialized_packet->packet = nullptr;
465 } 463 }
466 464
467 // static 465 // static
468 uint64_t QuicUtils::PackPathIdAndPacketNumber(QuicPathId path_id, 466 uint64_t QuicUtils::PackPathIdAndPacketNumber(QuicPathId path_id,
469 QuicPacketNumber packet_number) { 467 QuicPacketNumber packet_number) {
470 // Setting the nonce below relies on QuicPathId and QuicPacketNumber being 468 // Setting the nonce below relies on QuicPathId and QuicPacketNumber being
471 // specific sizes. 469 // specific sizes.
472 static_assert(sizeof(path_id) == 1, "Size of QuicPathId changed."); 470 static_assert(sizeof(path_id) == 1, "Size of QuicPathId changed.");
473 static_assert(sizeof(packet_number) == 8, 471 static_assert(sizeof(packet_number) == 8,
474 "Size of QuicPacketNumber changed."); 472 "Size of QuicPacketNumber changed.");
475 // Use path_id and lower 7 bytes of packet_number as lower 8 bytes of nonce. 473 // Use path_id and lower 7 bytes of packet_number as lower 8 bytes of nonce.
476 uint64_t path_id_packet_number = 474 uint64_t path_id_packet_number =
477 (static_cast<uint64_t>(path_id) << 56) | packet_number; 475 (static_cast<uint64_t>(path_id) << 56) | packet_number;
478 DCHECK(path_id != kDefaultPathId || path_id_packet_number == packet_number); 476 DCHECK(path_id != kDefaultPathId || path_id_packet_number == packet_number);
479 return path_id_packet_number; 477 return path_id_packet_number;
480 } 478 }
481 479
482 } // namespace net 480 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_unacked_packet_map_test.cc ('k') | net/quic/test_tools/quic_packet_creator_peer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698