commit 88d08f4cb5f181b09bad9ff684380798624d0aa5
author fkastenholz <fkastenholz@google.com> Fri Sep 06 07:38:04 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Sep 06 10:44:04 2019 -0700
tree ee6dc96c5283c3eb0385060517f036551e3463d3
parent a582187459fc8752c46d42c64819ce79e9cb44e2

Change Application and Transport ConnectionClose codes to uint64_t

IETF QUIC Transport and Application ConnectionClose Error Codes were 16 bit
unsigned numbers. Draft 22 of the IETF QUIC specification changed them to be a
varint62, which we keep internally as a uint64_t. This CL effects that change.

The benefits of this CL are A) somewhat cleaner internal code (elimination of random casts) and B) applications can use the full 62 bits of the connection close codes when using IETF QUIC.

gfe-relnote: N/A IETF QUIC only, V99 flag protected.
PiperOrigin-RevId: 267594523
Change-Id: I0d6a8af0bb134c15d6b034de4237a02e0458ee47

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index ec09686..9fc985f 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -8697,10 +8697,26 @@
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
   EXPECT_CALL(visitor_, OnConnectionClosed(_, _));
   EXPECT_EQ(Perspective::IS_CLIENT, connection_.perspective());
+  const QuicErrorCode kErrorCode = QUIC_INTERNAL_ERROR;
   std::unique_ptr<QuicConnectionCloseFrame> connection_close_frame(
-      new QuicConnectionCloseFrame(QUIC_INTERNAL_ERROR, ""));
+      new QuicConnectionCloseFrame(kErrorCode, ""));
   if (VersionHasIetfQuicFrames(connection_.transport_version())) {
-    connection_close_frame->close_type = IETF_QUIC_TRANSPORT_CONNECTION_CLOSE;
+    QuicErrorCodeToIetfMapping mapping =
+        QuicErrorCodeToTransportErrorCode(kErrorCode);
+    if (mapping.is_transport_close_) {
+      // Maps to a transport close
+      connection_close_frame->close_type = IETF_QUIC_TRANSPORT_CONNECTION_CLOSE;
+      connection_close_frame->transport_error_code =
+          mapping.transport_error_code_;
+      connection_close_frame->transport_close_frame_type = 0;
+    } else {
+      // Maps to an application close.
+      connection_close_frame->close_type =
+          IETF_QUIC_APPLICATION_CONNECTION_CLOSE;
+      connection_close_frame->application_error_code =
+          mapping.application_error_code_;
+    }
+    connection_close_frame->extracted_error_code = kErrorCode;
   }
   // Received 2 packets.
   QuicFrame frame;