| Index: net/quic/quic_connection_logger.cc
|
| diff --git a/net/quic/quic_connection_logger.cc b/net/quic/quic_connection_logger.cc
|
| index 408eb57b3b91a3a79cc6e82c9d9f14675a2ed999..fd60d8e8d526787186326f4cc69699b1f6e0ecc1 100644
|
| --- a/net/quic/quic_connection_logger.cc
|
| +++ b/net/quic/quic_connection_logger.cc
|
| @@ -38,7 +38,7 @@ const int kBoundingSampleInCumulativeHistogram = ((2 + 22) * 21) / 2;
|
| base::Value* NetLogQuicPacketCallback(const IPEndPoint* self_address,
|
| const IPEndPoint* peer_address,
|
| size_t packet_size,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("self_address", self_address->ToString());
|
| dict->SetString("peer_address", peer_address->ToString());
|
| @@ -52,7 +52,7 @@ base::Value* NetLogQuicPacketSentCallback(
|
| TransmissionType transmission_type,
|
| size_t packet_size,
|
| QuicTime sent_time,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("encryption_level", level);
|
| dict->SetInteger("transmission_type", transmission_type);
|
| @@ -67,7 +67,7 @@ base::Value* NetLogQuicPacketSentCallback(
|
| base::Value* NetLogQuicPacketRetransmittedCallback(
|
| QuicPacketSequenceNumber old_sequence_number,
|
| QuicPacketSequenceNumber new_sequence_number,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("old_packet_sequence_number",
|
| base::Uint64ToString(old_sequence_number));
|
| @@ -76,8 +76,9 @@ base::Value* NetLogQuicPacketRetransmittedCallback(
|
| return dict;
|
| }
|
|
|
| -base::Value* NetLogQuicPacketHeaderCallback(const QuicPacketHeader* header,
|
| - NetLog::LogLevel /* log_level */) {
|
| +base::Value* NetLogQuicPacketHeaderCallback(
|
| + const QuicPacketHeader* header,
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("connection_id",
|
| base::Uint64ToString(header->public_header.connection_id));
|
| @@ -91,8 +92,9 @@ base::Value* NetLogQuicPacketHeaderCallback(const QuicPacketHeader* header,
|
| return dict;
|
| }
|
|
|
| -base::Value* NetLogQuicStreamFrameCallback(const QuicStreamFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| +base::Value* NetLogQuicStreamFrameCallback(
|
| + const QuicStreamFrame* frame,
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("stream_id", frame->stream_id);
|
| dict->SetBoolean("fin", frame->fin);
|
| @@ -102,7 +104,7 @@ base::Value* NetLogQuicStreamFrameCallback(const QuicStreamFrame* frame,
|
| }
|
|
|
| base::Value* NetLogQuicAckFrameCallback(const QuicAckFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("largest_observed",
|
| base::Uint64ToString(frame->largest_observed));
|
| @@ -146,7 +148,7 @@ base::Value* NetLogQuicAckFrameCallback(const QuicAckFrame* frame,
|
|
|
| base::Value* NetLogQuicRstStreamFrameCallback(
|
| const QuicRstStreamFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("stream_id", frame->stream_id);
|
| dict->SetInteger("quic_rst_stream_error", frame->error_code);
|
| @@ -156,7 +158,7 @@ base::Value* NetLogQuicRstStreamFrameCallback(
|
|
|
| base::Value* NetLogQuicConnectionCloseFrameCallback(
|
| const QuicConnectionCloseFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("quic_error", frame->error_code);
|
| dict->SetString("details", frame->error_details);
|
| @@ -165,7 +167,7 @@ base::Value* NetLogQuicConnectionCloseFrameCallback(
|
|
|
| base::Value* NetLogQuicWindowUpdateFrameCallback(
|
| const QuicWindowUpdateFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("stream_id", frame->stream_id);
|
| dict->SetString("byte_offset", base::Uint64ToString(frame->byte_offset));
|
| @@ -174,7 +176,7 @@ base::Value* NetLogQuicWindowUpdateFrameCallback(
|
|
|
| base::Value* NetLogQuicBlockedFrameCallback(
|
| const QuicBlockedFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("stream_id", frame->stream_id);
|
| return dict;
|
| @@ -182,7 +184,7 @@ base::Value* NetLogQuicBlockedFrameCallback(
|
|
|
| base::Value* NetLogQuicGoAwayFrameCallback(
|
| const QuicGoAwayFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("quic_error", frame->error_code);
|
| dict->SetInteger("last_good_stream_id", frame->last_good_stream_id);
|
| @@ -192,7 +194,7 @@ base::Value* NetLogQuicGoAwayFrameCallback(
|
|
|
| base::Value* NetLogQuicStopWaitingFrameCallback(
|
| const QuicStopWaitingFrame* frame,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| base::DictionaryValue* sent_info = new base::DictionaryValue();
|
| dict->Set("sent_info", sent_info);
|
| @@ -203,7 +205,7 @@ base::Value* NetLogQuicStopWaitingFrameCallback(
|
|
|
| base::Value* NetLogQuicVersionNegotiationPacketCallback(
|
| const QuicVersionNegotiationPacket* packet,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| base::ListValue* versions = new base::ListValue();
|
| dict->Set("versions", versions);
|
| @@ -216,7 +218,7 @@ base::Value* NetLogQuicVersionNegotiationPacketCallback(
|
|
|
| base::Value* NetLogQuicCryptoHandshakeMessageCallback(
|
| const CryptoHandshakeMessage* message,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("quic_crypto_handshake_message", message->DebugString());
|
| return dict;
|
| @@ -225,7 +227,7 @@ base::Value* NetLogQuicCryptoHandshakeMessageCallback(
|
| base::Value* NetLogQuicOnConnectionClosedCallback(
|
| QuicErrorCode error,
|
| bool from_peer,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetInteger("quic_error", error);
|
| dict->SetBoolean("from_peer", from_peer);
|
| @@ -234,7 +236,7 @@ base::Value* NetLogQuicOnConnectionClosedCallback(
|
|
|
| base::Value* NetLogQuicCertificateVerifiedCallback(
|
| scoped_refptr<X509Certificate> cert,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| // Only the subjects are logged so that we can investigate connection pooling.
|
| // More fields could be logged in the future.
|
| std::vector<std::string> dns_names;
|
|
|