commit 243eabc0fdd837966408b96020ca7de3ea4a78f5
author dschinazi <dschinazi@google.com> Mon Aug 05 16:15:29 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 05 20:40:36 2019 -0700
tree 63f03709d6d3947bd2fb1ad7d8db21c1faeef443
parent df85e3f29a47e54ac5926f16e8e51be17eab9eb3

Refactor QUIC version parsing

This CL fixes an oversight where QuicFramer::ParsePublicHeader was not parsing the version when parsing packets from versions <= 43. This was not an issue because there are only two clients of that method:
1) QuicFramer::ProcessIetfPacketHeader and that is not called for versions <= 43.
2) QuicDispatcher::ProcessPacket and that was parsing the version after the fact (this CL now removes that when the quic_use_parse_public_header flag is true which corresponds to when the dispatcher uses ParsePublicHeader.

This CL also adds a test to prevent this from regressing.

Since this CL only refactors code and does not change functionality, it is not flag protected.

gfe-relnote: refactor version parsing, not flag protected
PiperOrigin-RevId: 261792952
Change-Id: If5a1333590a41e8a03fd53c6f8cea70fa47e8fd4

quic/core/quic_framer.cc

diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 426f0de..ea9d9f5 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -6396,6 +6396,7 @@
     PacketHeaderFormat* format,
     bool* version_present,
     QuicVersionLabel* version_label,
+    ParsedQuicVersion* parsed_version,
     QuicConnectionId* destination_connection_id,
     std::string* detailed_error) {
   *format = GOOGLE_QUIC_PACKET;
@@ -6409,9 +6410,12 @@
     *detailed_error = "Unable to read ConnectionId.";
     return QUIC_INVALID_PACKET_HEADER;
   }
-  if (*version_present && !ProcessVersionLabel(reader, version_label)) {
-    *detailed_error = "Unable to read protocol version.";
-    return QUIC_INVALID_PACKET_HEADER;
+  if (*version_present) {
+    if (!ProcessVersionLabel(reader, version_label)) {
+      *detailed_error = "Unable to read protocol version.";
+      return QUIC_INVALID_PACKET_HEADER;
+    }
+    *parsed_version = ParseQuicVersionLabel(*version_label);
   }
   return QUIC_NO_ERROR;
 }
@@ -6542,7 +6546,7 @@
   if (!ietf_format) {
     return ParsePublicHeaderGoogleQuic(
         reader, first_byte, format, version_present, version_label,
-        destination_connection_id, detailed_error);
+        parsed_version, destination_connection_id, detailed_error);
   }
 
   *format = GetIetfPacketHeaderFormat(*first_byte);