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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_protocol.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/quic/quic_protocol.h ('k') | net/quic/quic_protocol_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_protocol.cc
diff --git a/net/quic/quic_protocol.cc b/net/quic/quic_protocol.cc
index facb15fe010d0c2b4165cc8158c6634f749de19c..e5f89de9b966f9c4ff8df9fb1890f67ce15ba48d 100644
--- a/net/quic/quic_protocol.cc
+++ b/net/quic/quic_protocol.cc
@@ -27,8 +27,9 @@ size_t GetPacketHeaderSize(QuicConnectionIdLength connection_id_length,
QuicSequenceNumberLength sequence_number_length,
InFecGroup is_in_fec_group) {
return kPublicFlagsSize + connection_id_length +
- (include_version ? kQuicVersionSize : 0) + sequence_number_length +
- kPrivateFlagsSize + (is_in_fec_group == IN_FEC_GROUP ? kFecGroupSize : 0);
+ (include_version ? kQuicVersionSize : 0) + sequence_number_length +
+ kPrivateFlagsSize +
+ (is_in_fec_group == IN_FEC_GROUP ? kFecGroupSize : 0);
}
size_t GetStartOfFecProtectedData(
@@ -49,7 +50,8 @@ size_t GetStartOfEncryptedData(
return GetPacketHeaderSize(connection_id_length,
include_version,
sequence_number_length,
- NOT_IN_FEC_GROUP) - kPrivateFlagsSize;
+ NOT_IN_FEC_GROUP) -
+ kPrivateFlagsSize;
}
QuicPacketPublicHeader::QuicPacketPublicHeader()
@@ -70,7 +72,8 @@ QuicPacketPublicHeader::QuicPacketPublicHeader(
versions(other.versions) {
}
-QuicPacketPublicHeader::~QuicPacketPublicHeader() {}
+QuicPacketPublicHeader::~QuicPacketPublicHeader() {
+}
QuicPacketHeader::QuicPacketHeader()
: fec_flag(false),
@@ -92,20 +95,17 @@ QuicPacketHeader::QuicPacketHeader(const QuicPacketPublicHeader& header)
}
QuicPublicResetPacket::QuicPublicResetPacket()
- : nonce_proof(0),
- rejected_sequence_number(0) {}
+ : nonce_proof(0), rejected_sequence_number(0) {
+}
QuicPublicResetPacket::QuicPublicResetPacket(
const QuicPacketPublicHeader& header)
- : public_header(header),
- nonce_proof(0),
- rejected_sequence_number(0) {}
+ : public_header(header), nonce_proof(0), rejected_sequence_number(0) {
+}
QuicStreamFrame::QuicStreamFrame()
- : stream_id(0),
- fin(false),
- offset(0),
- notifier(NULL) {}
+ : stream_id(0), fin(false), offset(0), notifier(NULL) {
+}
QuicStreamFrame::QuicStreamFrame(const QuicStreamFrame& frame)
: stream_id(frame.stream_id),
@@ -138,10 +138,8 @@ string* QuicStreamFrame::GetDataAsString() const {
}
uint32 MakeQuicTag(char a, char b, char c, char d) {
- return static_cast<uint32>(a) |
- static_cast<uint32>(b) << 8 |
- static_cast<uint32>(c) << 16 |
- static_cast<uint32>(d) << 24;
+ return static_cast<uint32>(a) | static_cast<uint32>(b) << 8 |
+ static_cast<uint32>(c) << 16 | static_cast<uint32>(d) << 24;
}
QuicVersionVector QuicSupportedVersions() {
@@ -183,8 +181,8 @@ QuicVersion QuicTagToQuicVersion(const QuicTag version_tag) {
}
#define RETURN_STRING_LITERAL(x) \
-case x: \
-return #x
+ case x: \
+ return #x
string QuicVersionToString(const QuicVersion version) {
switch (version) {
@@ -226,7 +224,7 @@ ostream& operator<<(ostream& os, const QuicPacketHeader& header) {
<< ", entropy hash: " << static_cast<int>(header.entropy_hash)
<< ", sequence_number: " << header.packet_sequence_number
<< ", is_in_fec_group:" << header.is_in_fec_group
- << ", fec_group: " << header.fec_group<< "}\n";
+ << ", fec_group: " << header.fec_group << "}\n";
return os;
}
@@ -234,14 +232,16 @@ ReceivedPacketInfo::ReceivedPacketInfo()
: entropy_hash(0),
largest_observed(0),
delta_time_largest_observed(QuicTime::Delta::Infinite()),
- is_truncated(false) {}
+ is_truncated(false) {
+}
-ReceivedPacketInfo::~ReceivedPacketInfo() {}
+ReceivedPacketInfo::~ReceivedPacketInfo() {
+}
bool IsAwaitingPacket(const ReceivedPacketInfo& received_info,
QuicPacketSequenceNumber sequence_number) {
return sequence_number > received_info.largest_observed ||
- ContainsKey(received_info.missing_packets, sequence_number);
+ ContainsKey(received_info.missing_packets, sequence_number);
}
void InsertMissingPacketsBetween(ReceivedPacketInfo* received_info,
@@ -253,13 +253,14 @@ void InsertMissingPacketsBetween(ReceivedPacketInfo* received_info,
}
QuicStopWaitingFrame::QuicStopWaitingFrame()
- : entropy_hash(0),
- least_unacked(0) {
+ : entropy_hash(0), least_unacked(0) {
}
-QuicStopWaitingFrame::~QuicStopWaitingFrame() {}
+QuicStopWaitingFrame::~QuicStopWaitingFrame() {
+}
-QuicAckFrame::QuicAckFrame() {}
+QuicAckFrame::QuicAckFrame() {
+}
CongestionFeedbackMessageTCP::CongestionFeedbackMessageTCP()
: receive_window(0) {
@@ -269,15 +270,17 @@ CongestionFeedbackMessageInterArrival::CongestionFeedbackMessageInterArrival() {
}
CongestionFeedbackMessageInterArrival::
- ~CongestionFeedbackMessageInterArrival() {}
+ ~CongestionFeedbackMessageInterArrival() {
+}
-QuicCongestionFeedbackFrame::QuicCongestionFeedbackFrame() : type(kTCP) {}
+QuicCongestionFeedbackFrame::QuicCongestionFeedbackFrame() : type(kTCP) {
+}
-QuicCongestionFeedbackFrame::~QuicCongestionFeedbackFrame() {}
+QuicCongestionFeedbackFrame::~QuicCongestionFeedbackFrame() {
+}
-QuicRstStreamErrorCode AdjustErrorForVersion(
- QuicRstStreamErrorCode error_code,
- QuicVersion version) {
+QuicRstStreamErrorCode AdjustErrorForVersion(QuicRstStreamErrorCode error_code,
+ QuicVersion version) {
switch (error_code) {
case QUIC_RST_FLOW_CONTROL_ACCOUNTING:
if (version <= QUIC_VERSION_17) {
@@ -291,16 +294,13 @@ QuicRstStreamErrorCode AdjustErrorForVersion(
}
QuicRstStreamFrame::QuicRstStreamFrame()
- : stream_id(0),
- error_code(QUIC_STREAM_NO_ERROR) {
+ : stream_id(0), error_code(QUIC_STREAM_NO_ERROR) {
}
QuicRstStreamFrame::QuicRstStreamFrame(QuicStreamId stream_id,
QuicRstStreamErrorCode error_code,
QuicStreamOffset bytes_written)
- : stream_id(stream_id),
- error_code(error_code),
- byte_offset(bytes_written) {
+ : stream_id(stream_id), error_code(error_code), byte_offset(bytes_written) {
DCHECK_LE(error_code, numeric_limits<uint8>::max());
}
@@ -308,64 +308,54 @@ QuicConnectionCloseFrame::QuicConnectionCloseFrame()
: error_code(QUIC_NO_ERROR) {
}
-QuicFrame::QuicFrame() {}
+QuicFrame::QuicFrame() {
+}
QuicFrame::QuicFrame(QuicPaddingFrame* padding_frame)
- : type(PADDING_FRAME),
- padding_frame(padding_frame) {
+ : type(PADDING_FRAME), padding_frame(padding_frame) {
}
QuicFrame::QuicFrame(QuicStreamFrame* stream_frame)
- : type(STREAM_FRAME),
- stream_frame(stream_frame) {
+ : type(STREAM_FRAME), stream_frame(stream_frame) {
}
-QuicFrame::QuicFrame(QuicAckFrame* frame)
- : type(ACK_FRAME),
- ack_frame(frame) {
+QuicFrame::QuicFrame(QuicAckFrame* frame) : type(ACK_FRAME), ack_frame(frame) {
}
QuicFrame::QuicFrame(QuicCongestionFeedbackFrame* frame)
- : type(CONGESTION_FEEDBACK_FRAME),
- congestion_feedback_frame(frame) {
+ : type(CONGESTION_FEEDBACK_FRAME), congestion_feedback_frame(frame) {
}
QuicFrame::QuicFrame(QuicStopWaitingFrame* frame)
- : type(STOP_WAITING_FRAME),
- stop_waiting_frame(frame) {
+ : type(STOP_WAITING_FRAME), stop_waiting_frame(frame) {
}
QuicFrame::QuicFrame(QuicPingFrame* frame)
- : type(PING_FRAME),
- ping_frame(frame) {
+ : type(PING_FRAME), ping_frame(frame) {
}
QuicFrame::QuicFrame(QuicRstStreamFrame* frame)
- : type(RST_STREAM_FRAME),
- rst_stream_frame(frame) {
+ : type(RST_STREAM_FRAME), rst_stream_frame(frame) {
}
QuicFrame::QuicFrame(QuicConnectionCloseFrame* frame)
- : type(CONNECTION_CLOSE_FRAME),
- connection_close_frame(frame) {
+ : type(CONNECTION_CLOSE_FRAME), connection_close_frame(frame) {
}
QuicFrame::QuicFrame(QuicGoAwayFrame* frame)
- : type(GOAWAY_FRAME),
- goaway_frame(frame) {
+ : type(GOAWAY_FRAME), goaway_frame(frame) {
}
QuicFrame::QuicFrame(QuicWindowUpdateFrame* frame)
- : type(WINDOW_UPDATE_FRAME),
- window_update_frame(frame) {
+ : type(WINDOW_UPDATE_FRAME), window_update_frame(frame) {
}
QuicFrame::QuicFrame(QuicBlockedFrame* frame)
- : type(BLOCKED_FRAME),
- blocked_frame(frame) {
+ : type(BLOCKED_FRAME), blocked_frame(frame) {
}
-QuicFecData::QuicFecData() : fec_group(0) {}
+QuicFecData::QuicFecData() : fec_group(0) {
+}
ostream& operator<<(ostream& os, const QuicStopWaitingFrame& sent_info) {
os << "entropy_hash: " << static_cast<int>(sent_info.entropy_hash)
@@ -382,13 +372,15 @@ ostream& operator<<(ostream& os, const ReceivedPacketInfo& received_info) {
<< " missing_packets: [ ";
for (SequenceNumberSet::const_iterator it =
received_info.missing_packets.begin();
- it != received_info.missing_packets.end(); ++it) {
+ it != received_info.missing_packets.end();
+ ++it) {
os << *it << " ";
}
os << " ] revived_packets: [ ";
for (SequenceNumberSet::const_iterator it =
received_info.revived_packets.begin();
- it != received_info.revived_packets.end(); ++it) {
+ it != received_info.revived_packets.end();
+ ++it) {
os << *it << " ";
}
os << " ]";
@@ -397,7 +389,7 @@ ostream& operator<<(ostream& os, const ReceivedPacketInfo& received_info) {
ostream& operator<<(ostream& os, const QuicFrame& frame) {
switch (frame.type) {
- case PADDING_FRAME: {
+ case PADDING_FRAME: {
os << "type { PADDING_FRAME } ";
break;
}
@@ -506,7 +498,8 @@ ostream& operator<<(ostream& os,
os << " received packets: [ ";
for (TimeMap::const_iterator it =
inter_arrival.received_packet_times.begin();
- it != inter_arrival.received_packet_times.end(); ++it) {
+ it != inter_arrival.received_packet_times.end();
+ ++it) {
os << it->first << "@" << it->second.ToDebuggingValue() << " ";
}
os << "]";
@@ -531,8 +524,7 @@ CongestionFeedbackMessageFixRate::CongestionFeedbackMessageFixRate()
}
QuicGoAwayFrame::QuicGoAwayFrame()
- : error_code(QUIC_NO_ERROR),
- last_good_stream_id(0) {
+ : error_code(QUIC_NO_ERROR), last_good_stream_id(0) {
}
QuicGoAwayFrame::QuicGoAwayFrame(QuicErrorCode error_code,
@@ -544,34 +536,28 @@ QuicGoAwayFrame::QuicGoAwayFrame(QuicErrorCode error_code,
DCHECK_LE(error_code, numeric_limits<uint8>::max());
}
-QuicData::QuicData(const char* buffer,
- size_t length)
- : buffer_(buffer),
- length_(length),
- owns_buffer_(false) {
+QuicData::QuicData(const char* buffer, size_t length)
+ : buffer_(buffer), length_(length), owns_buffer_(false) {
}
-QuicData::QuicData(char* buffer,
- size_t length,
- bool owns_buffer)
- : buffer_(buffer),
- length_(length),
- owns_buffer_(owns_buffer) {
+QuicData::QuicData(char* buffer, size_t length, bool owns_buffer)
+ : buffer_(buffer), length_(length), owns_buffer_(owns_buffer) {
}
QuicData::~QuicData() {
if (owns_buffer_) {
- delete [] const_cast<char*>(buffer_);
+ delete[] const_cast<char*>(buffer_);
}
}
QuicWindowUpdateFrame::QuicWindowUpdateFrame(QuicStreamId stream_id,
QuicStreamOffset byte_offset)
- : stream_id(stream_id),
- byte_offset(byte_offset) {}
+ : stream_id(stream_id), byte_offset(byte_offset) {
+}
QuicBlockedFrame::QuicBlockedFrame(QuicStreamId stream_id)
- : stream_id(stream_id) {}
+ : stream_id(stream_id) {
+}
QuicPacket::QuicPacket(char* buffer,
size_t length,
@@ -588,15 +574,14 @@ QuicPacket::QuicPacket(char* buffer,
sequence_number_length_(sequence_number_length) {
}
-QuicEncryptedPacket::QuicEncryptedPacket(const char* buffer,
- size_t length)
+QuicEncryptedPacket::QuicEncryptedPacket(const char* buffer, size_t length)
: QuicData(buffer, length) {
}
QuicEncryptedPacket::QuicEncryptedPacket(char* buffer,
size_t length,
bool owns_buffer)
- : QuicData(buffer, length, owns_buffer) {
+ : QuicData(buffer, length, owns_buffer) {
}
StringPiece QuicPacket::FecProtectedData() const {
@@ -610,19 +595,19 @@ StringPiece QuicPacket::AssociatedData() const {
data() + kStartOfHashData,
GetStartOfEncryptedData(
connection_id_length_, includes_version_, sequence_number_length_) -
- kStartOfHashData);
+ kStartOfHashData);
}
StringPiece QuicPacket::BeforePlaintext() const {
- return StringPiece(data(), GetStartOfEncryptedData(connection_id_length_,
- includes_version_,
- sequence_number_length_));
+ return StringPiece(
+ data(),
+ GetStartOfEncryptedData(
+ connection_id_length_, includes_version_, sequence_number_length_));
}
StringPiece QuicPacket::Plaintext() const {
- const size_t start_of_encrypted_data =
- GetStartOfEncryptedData(
- connection_id_length_, includes_version_, sequence_number_length_);
+ const size_t start_of_encrypted_data = GetStartOfEncryptedData(
+ connection_id_length_, includes_version_, sequence_number_length_);
return StringPiece(data() + start_of_encrypted_data,
length() - start_of_encrypted_data);
}
@@ -720,7 +705,8 @@ SerializedPacket::SerializedPacket(
retransmittable_frames(retransmittable_frames) {
}
-SerializedPacket::~SerializedPacket() {}
+SerializedPacket::~SerializedPacket() {
+}
QuicEncryptedPacket* QuicEncryptedPacket::Clone() const {
char* buffer = new char[this->length()];
@@ -733,10 +719,8 @@ ostream& operator<<(ostream& os, const QuicEncryptedPacket& s) {
return os;
}
-QuicConsumedData::QuicConsumedData(size_t bytes_consumed,
- bool fin_consumed)
- : bytes_consumed(bytes_consumed),
- fin_consumed(fin_consumed) {
+QuicConsumedData::QuicConsumedData(size_t bytes_consumed, bool fin_consumed)
+ : bytes_consumed(bytes_consumed), fin_consumed(fin_consumed) {
}
ostream& operator<<(ostream& os, const QuicConsumedData& s) {
@@ -745,15 +729,11 @@ ostream& operator<<(ostream& os, const QuicConsumedData& s) {
return os;
}
-WriteResult::WriteResult()
- : status(WRITE_STATUS_ERROR),
- bytes_written(0) {
+WriteResult::WriteResult() : status(WRITE_STATUS_ERROR), bytes_written(0) {
}
-WriteResult::WriteResult(WriteStatus status,
- int bytes_written_or_error_code)
- : status(status),
- bytes_written(bytes_written_or_error_code) {
+WriteResult::WriteResult(WriteStatus status, int bytes_written_or_error_code)
+ : status(status), bytes_written(bytes_written_or_error_code) {
}
} // namespace net
« net/base/mime_util_unittest.cc ('K') | « net/quic/quic_protocol.h ('k') | net/quic/quic_protocol_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698