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

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

Issue 1481403005: Fix size_t truncations in net for 64-bit VS 2015 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback 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 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_connection.h" 5 #include "net/quic/quic_connection.h"
6 6
7 #include <ostream> 7 #include <ostream>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 QuicFrames frames; 794 QuicFrames frames;
795 frames.push_back(frame); 795 frames.push_back(frame);
796 scoped_ptr<QuicPacket> packet(ConstructPacket(header, frames)); 796 scoped_ptr<QuicPacket> packet(ConstructPacket(header, frames));
797 797
798 char buffer[kMaxPacketSize]; 798 char buffer[kMaxPacketSize];
799 size_t encrypted_length = 799 size_t encrypted_length =
800 framer_.EncryptPayload(level, number, *packet, buffer, kMaxPacketSize); 800 framer_.EncryptPayload(level, number, *packet, buffer, kMaxPacketSize);
801 connection_.ProcessUdpPacket( 801 connection_.ProcessUdpPacket(
802 kSelfAddress, kPeerAddress, 802 kSelfAddress, kPeerAddress,
803 QuicEncryptedPacket(buffer, encrypted_length, false)); 803 QuicEncryptedPacket(buffer, encrypted_length, false));
804 return encrypted_length; 804 return base::checked_cast<QuicPacketEntropyHash>(encrypted_length);
805 } 805 }
806 806
807 size_t ProcessDataPacket(QuicPacketNumber number, 807 size_t ProcessDataPacket(QuicPacketNumber number,
808 QuicFecGroupNumber fec_group, 808 QuicFecGroupNumber fec_group,
809 bool entropy_flag) { 809 bool entropy_flag) {
810 return ProcessDataPacketAtLevel(number, fec_group, entropy_flag, 810 return ProcessDataPacketAtLevel(number, fec_group, entropy_flag,
811 ENCRYPTION_NONE); 811 ENCRYPTION_NONE);
812 } 812 }
813 813
814 size_t ProcessDataPacketAtLevel(QuicPacketNumber number, 814 size_t ProcessDataPacketAtLevel(QuicPacketNumber number,
(...skipping 4627 matching lines...) Expand 10 before | Expand all | Expand 10 after
5442 EXPECT_EQ(1u, writer_->stream_frames().size()); 5442 EXPECT_EQ(1u, writer_->stream_frames().size());
5443 EXPECT_TRUE(connection_.GetSendAlarm()->IsSet()); 5443 EXPECT_TRUE(connection_.GetSendAlarm()->IsSet());
5444 EXPECT_EQ(clock_.Now().Add(QuicTime::Delta::FromMilliseconds(2)), 5444 EXPECT_EQ(clock_.Now().Add(QuicTime::Delta::FromMilliseconds(2)),
5445 connection_.GetSendAlarm()->deadline()); 5445 connection_.GetSendAlarm()->deadline());
5446 writer_->Reset(); 5446 writer_->Reset();
5447 } 5447 }
5448 5448
5449 } // namespace 5449 } // namespace
5450 } // namespace test 5450 } // namespace test
5451 } // namespace net 5451 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/congestion_control/time_loss_algorithm_test.cc ('k') | net/server/web_socket_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698