[connection] use frame_type=PADDING for CONNECTION_CLOSE

When sending a CONNECTION_CLOSE from the QUIC layer, set the frame type to PADDING if unknown.
bw1109 · Mar 8, 2021 · 426594d · 426594d
1 parent 9baf0c9
commit 426594d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/aioquic/quic/connection.py b/src/aioquic/quic/connection.py
@@ -637,7 +637,7 @@ def handle_timer(self, now: float) -> None:
             if self._close_event is None:
                 self._close_event = events.ConnectionTerminated(
                     error_code=QuicErrorCode.INTERNAL_ERROR,
-                    frame_type=None,
+                    frame_type=QuicFrameType.PADDING,
                     reason_phrase="Idle timeout",
                 )
             self._close_end()
@@ -742,7 +742,7 @@ def receive_datagram(self, data: bytes, addr: NetworkAddress, now: float) -> Non
                     self._logger.error("Could not find a common protocol version")
                     self._close_event = events.ConnectionTerminated(
                         error_code=QuicErrorCode.INTERNAL_ERROR,
-                        frame_type=None,
+                        frame_type=QuicFrameType.PADDING,
                         reason_phrase="Could not find a common protocol version",
                     )
                     self._close_end()
@@ -858,7 +858,7 @@ def receive_datagram(self, data: bytes, addr: NetworkAddress, now: float) -> Non
             if plain_header[0] & reserved_mask:
                 self.close(
                     error_code=QuicErrorCode.PROTOCOL_VIOLATION,
-                    frame_type=None,
+                    frame_type=QuicFrameType.PADDING,
                     reason_phrase="Reserved bits must be zero",
                 )
                 return

diff --git a/tests/test_connection.py b/tests/test_connection.py
@@ -907,7 +907,7 @@ def encrypt_packet(plain_header, plain_payload, packet_number):
             client._close_event,
             events.ConnectionTerminated(
                 error_code=QuicErrorCode.PROTOCOL_VIOLATION,
-                frame_type=None,
+                frame_type=QuicFrameType.PADDING,
                 reason_phrase="Reserved bits must be zero",
             ),
         )
@@ -2292,7 +2292,7 @@ def test_version_negotiation_fail(self):
         event = client.next_event()
         self.assertEqual(type(event), events.ConnectionTerminated)
         self.assertEqual(event.error_code, QuicErrorCode.INTERNAL_ERROR)
-        self.assertEqual(event.frame_type, None)
+        self.assertEqual(event.frame_type, QuicFrameType.PADDING)
         self.assertEqual(
             event.reason_phrase, "Could not find a common protocol version"
         )