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

Unified Diff: net/quic/core/quic_framer.cc

Issue 2403183002: relnote: Remove remaining now unused FEC code from QUIC. Merge internal change: 135007563 (Closed)
Patch Set: Created 4 years, 2 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/core/quic_connection.cc ('k') | net/quic/core/quic_framer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_framer.cc
diff --git a/net/quic/core/quic_framer.cc b/net/quic/core/quic_framer.cc
index b11a52f6ff07ac8712f6c0e95318369a1db5a3ea..4bfe7254e831626bbdec22d80fd75b89024e87bb 100644
--- a/net/quic/core/quic_framer.cc
+++ b/net/quic/core/quic_framer.cc
@@ -643,7 +643,6 @@ bool QuicFramer::ProcessDataPacket(QuicDataReader* encrypted_reader,
return RaiseError(QUIC_PACKET_TOO_LARGE);
}
- DCHECK(!header.fec_flag);
// Handle the payload.
if (!ProcessFrameData(&reader, header)) {
DCHECK_NE(QUIC_NO_ERROR, error_); // ProcessFrameData sets the error.
@@ -1102,28 +1101,12 @@ bool QuicFramer::ProcessAuthenticatedHeader(QuicDataReader* reader,
return RaiseError(QUIC_INVALID_PACKET_HEADER);
}
- if (private_flags > PACKET_PRIVATE_FLAGS_MAX_VERSION_32) {
+ if (private_flags > PACKET_PRIVATE_FLAGS_MAX) {
set_detailed_error("Illegal private flags value.");
return RaiseError(QUIC_INVALID_PACKET_HEADER);
}
header->entropy_flag = (private_flags & PACKET_PRIVATE_FLAGS_ENTROPY) != 0;
- header->fec_flag = (private_flags & PACKET_PRIVATE_FLAGS_FEC) != 0;
-
- if ((private_flags & PACKET_PRIVATE_FLAGS_FEC_GROUP) != 0) {
- uint8_t first_fec_protected_packet_offset;
- if (!reader->ReadBytes(&first_fec_protected_packet_offset, 1)) {
- set_detailed_error("Unable to read first fec protected packet offset.");
- return RaiseError(QUIC_INVALID_PACKET_HEADER);
- }
- if (first_fec_protected_packet_offset >= header->packet_number) {
- set_detailed_error(
- "First fec protected packet offset must be less "
- "than the packet number.");
- return RaiseError(QUIC_INVALID_PACKET_HEADER);
- }
- }
-
header->entropy_hash = GetPacketEntropyHash(*header);
return true;
}
« no previous file with comments | « net/quic/core/quic_connection.cc ('k') | net/quic/core/quic_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698