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

Unified Diff: net/quic/quic_connection.cc

Issue 887243005: Move is_fec_packet from QuicPacket to SerializedPacket in order to allow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/congestion_control/time_loss_algorithm_test.cc ('k') | net/quic/quic_framer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index 778d6d0c51ee5353784a053866bef381235e756e..ce3b0010aa578b46dcbce3bcb5af68ff0e559bb9 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -1439,15 +1439,14 @@ bool QuicConnection::WritePacketInner(QueuedPacket* packet) {
}
DCHECK_LE(encrypted->length(), packet_generator_.max_packet_length());
DVLOG(1) << ENDPOINT << "Sending packet " << sequence_number << " : "
- << (packet->serialized_packet.packet->is_fec_packet() ? "FEC " :
- (IsRetransmittable(*packet) == HAS_RETRANSMITTABLE_DATA
- ? "data bearing " : " ack only "))
- << ", encryption level: "
+ << (packet->serialized_packet.is_fec_packet
+ ? "FEC "
+ : (IsRetransmittable(*packet) == HAS_RETRANSMITTABLE_DATA
+ ? "data bearing "
+ : " ack only ")) << ", encryption level: "
<< QuicUtils::EncryptionLevelToString(packet->encryption_level)
- << ", length:"
- << packet->serialized_packet.packet->length()
- << ", encrypted length:"
- << encrypted->length();
+ << ", length:" << packet->serialized_packet.packet->length()
+ << ", encrypted length:" << encrypted->length();
DVLOG(2) << ENDPOINT << "packet(" << sequence_number << "): " << std::endl
<< QuicUtils::StringToHexASCIIDump(
packet->serialized_packet.packet->AsStringPiece());
@@ -1604,7 +1603,7 @@ void QuicConnection::OnSerializedPacket(
sent_packet_manager_.OnSerializedPacket(serialized_packet);
}
}
- if (serialized_packet.packet->is_fec_packet() && fec_alarm_->IsSet()) {
+ if (serialized_packet.is_fec_packet && fec_alarm_->IsSet()) {
// If an FEC packet is serialized with the FEC alarm set, cancel the alarm.
fec_alarm_->Cancel();
}
« no previous file with comments | « net/quic/congestion_control/time_loss_algorithm_test.cc ('k') | net/quic/quic_framer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698