pypcapkit 1.3.1.post7__tar.gz → 1.3.1.post8__tar.gz

{pypcapkit-1.3.1.post7/pypcapkit.egg-info → pypcapkit-1.3.1.post8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypcapkit
-Version: 1.3.1.post7
+Version: 1.3.1.post8
 Summary: PyPCAPKit: comprehensive network packet analysis library
 Author-email: Jarry Shaw <jarryshaw@icloud.com>
 Maintainer: Jarry Shaw

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/__init__.py

@@ -123,4 +123,4 @@ __all__ = [
 ]
 
 #: version number
-__version__ = '1.3.1.post7'
+__version__ = '1.3.1.post8'

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/const/reg/apptype.py

@@ -11979,9 +11979,9 @@ class AppType(StrEnum):
     #: - [UDP] Indura Collector
     indura: 'AppType' = 3156, 'indura', TransportProtocol.get('tcp') | TransportProtocol.get('udp')
 
-    #: - [TCP] CCC Listener Port
-    #: - [UDP] CCC Listener Port
-    e3consultants: 'AppType' = 3157, 'e3consultants', TransportProtocol.get('tcp') | TransportProtocol.get('udp')
+    #: - [TCP] LSA Communicator
+    #: - [UDP] LSA Communicator
+    lsa_comm: 'AppType' = 3157, 'lsa-comm', TransportProtocol.get('tcp') | TransportProtocol.get('udp')
 
     #: - [TCP] SmashTV Protocol
     #: - [UDP] SmashTV Protocol

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/corekit/infoclass.py

@@ -325,6 +325,8 @@ class Info(Mapping[str, VT], Generic[VT], metaclass=InfoMeta):
 
     def __iter__(self) -> 'Iterator[str]':
         for key in self.__dict__:
+            if key in self.__excluded__:
+               continue
             yield self.__map_reverse__.get(key, key)
 
     def __getitem__(self, name: 'str') -> 'VT':

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/dumpkit/pcap.py

@@ -13,6 +13,7 @@ import sys
 from typing import TYPE_CHECKING
 
 from pcapkit.dumpkit.common import DumperBase as Dumper
+from pcapkit.protocols.data.misc.pcap.header import Header as Data_Header
 from pcapkit.protocols.misc.pcap.frame import Frame
 from pcapkit.protocols.misc.pcap.header import Header
 
@@ -24,6 +25,7 @@ if TYPE_CHECKING:
     from typing_extensions import Literal
 
     from pcapkit.const.reg.linktype import LinkType as Enum_LinkType
+    from pcapkit.protocols.data.misc.pcap.frame import Frame as Data_Frame
 
 __all__ = [
     'PCAPIO',
@@ -41,6 +43,9 @@ class PCAPIO(Dumper):
         **kwargs: arbitrary keyword arguments
 
     """
+    if TYPE_CHECKING:
+        #: PCAP file global header.
+        _ghdr: 'Data_Header'
 
     ##########################################################################
     # Properties.
@@ -77,7 +82,7 @@ class PCAPIO(Dumper):
 
         super().__init__(fname, protocol=protocol, byteorder=byteorder, nanosecond=nanosecond, **kwargs)
 
-    def __call__(self, value: 'Frame', name: 'Optional[str]' = None) -> 'PCAPIO':
+    def __call__(self, value: 'Data_Frame', name: 'Optional[str]' = None) -> 'PCAPIO':
         """Dump a new frame.
 
         Args:
@@ -108,15 +113,17 @@ class PCAPIO(Dumper):
             **kwargs: arbitrary keyword arguments
 
         """
-        packet = Header(
+        header = Header(
             network=protocol,
             byteorder=byteorder,
             nanosecond=nanosecond,
-        ).data
+        )
+        packet = header.data
         with open(self._file, 'wb') as file:
             file.write(packet)
+        self._ghdr = header.info
 
-    def _append_value(self, value: 'Frame', file: 'IO[bytes]', name: 'str') -> 'None':  # pylint: disable=unused-argument
+    def _append_value(self, value: 'Data_Frame', file: 'IO[bytes]', name: 'str') -> 'None':  # pylint: disable=unused-argument
         """Call this function to write contents.
 
         Args:
@@ -130,7 +137,8 @@ class PCAPIO(Dumper):
             num=self._fnum,
             proto=self._link,
             packet=value.packet,
-            **value.info.frame_info,
+            header=self._ghdr,
+            **value.frame_info,
         ).data
         file.write(packet)
         self._fnum += 1

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/application/ftp.py

@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from typing_extensions import Literal
@@ -20,7 +20,7 @@ __all__ = [
 ]
 
 
-class FTP(Data):
+class FTP(Protocol):
     """Data model for FTP protocol."""
 
     #: Type.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/application/httpv1.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from typing import Any
@@ -23,7 +24,7 @@ __all__ = [
 
 
 @info_final
-class HTTP(Data):
+class HTTP(Protocol):
     """Data model for HTTP/1.* protocol."""
 
     #: HTTP receipt.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/application/httpv2.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from typing import Optional
@@ -38,7 +39,7 @@ class Flags(Data):
         __value__: 'FrameType.Flags'
 
 
-class HTTP(Data):
+class HTTP(Protocol):
     """Data model for HTTP/2 protocol."""
 
     #: Length.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ah.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from pcapkit.const.reg.transtype import TransType
@@ -13,7 +13,7 @@ __all__ = ['AH']
 
 
 @info_final
-class AH(Data):
+class AH(Protocol):
     """Data model for AH protocol."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/hip.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import timedelta
@@ -82,7 +83,7 @@ class Parameter(Data):
 
 
 @info_final
-class HIP(Data):
+class HIP(Protocol):
     """Data model for HIP header."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/hopopt.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import timedelta
@@ -50,7 +51,7 @@ class Option(Data):
 
 
 @info_final
-class HOPOPT(Data):
+class HOPOPT(Protocol):
     """Data model for HOPOPT protocol."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ipv4.py

@@ -7,6 +7,7 @@ from pcapkit.const.ipv4.option_class import OptionClass
 from pcapkit.const.ipv4.tos_del import ToSDelay
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import timedelta
@@ -88,7 +89,7 @@ class Flags(Data):
 
 
 @info_final
-class IPv4(Data):
+class IPv4(Protocol):
     """Data model for IPv4 packet."""
 
     #: Version.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ipv6.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from ipaddress import IPv6Address
@@ -21,7 +21,7 @@ __all__ = [
 
 
 @info_final
-class IPv6(Data):
+class IPv6(Protocol):
     """Data model for Internet Protocol version 6.
 
     Important:

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ipv6_frag.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from pcapkit.const.reg.transtype import TransType
@@ -13,7 +13,7 @@ __all__ = ['IPv6_Frag']
 
 
 @info_final
-class IPv6_Frag(Data):
+class IPv6_Frag(Protocol):
     """Data model for IPv6 fragment header."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ipv6_opts.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import timedelta
@@ -50,7 +51,7 @@ class Option(Data):
 
 
 @info_final
-class IPv6_Opts(Data):
+class IPv6_Opts(Protocol):
     """Data model for IPv6-Opts protocol."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ipv6_route.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from ipaddress import IPv6Address
@@ -19,7 +19,7 @@ __all__ = [
 ]
 
 
-class IPv6_Route(Data):
+class IPv6_Route(Protocol):
     """Data model for IPv6-Route protocol."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/ipx.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from pcapkit.const.ipx.packet import Packet
@@ -35,7 +36,7 @@ class Address(Data):
 
 
 @info_final
-class IPX(Data):
+class IPX(Protocol):
     """Data model for Internetwork Packet Exchange."""
 
     #: Checksum.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/internet/mh.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import datetime as dt_type
@@ -84,7 +85,7 @@ __all__ = [
 ]
 
 
-class MH(Data):
+class MH(Protocol):
     """Data model for MH protocol."""
 
     #: Next header.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/link/arp.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from ipaddress import IPv4Address, IPv6Address
@@ -43,7 +44,7 @@ class Type(Data):
 
 
 @info_final
-class ARP(Data):
+class ARP(Protocol):
     """Data model for ARP packet."""
 
     #: Hardware type.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/link/ethernet.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from pcapkit.const.reg.ethertype import EtherType
@@ -13,7 +14,7 @@ __all__ = ['Ethernet']
 
 
 @info_final
-class Ethernet(Data):
+class Ethernet(Protocol):
     """Data model for ethernet packet."""
 
     #: Destination MAC address.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/link/l2tp.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from typing import Optional
@@ -34,7 +35,7 @@ class Flags(Data):
 
 
 @info_final
-class L2TP(Data):
+class L2TP(Protocol):
     """Data model for L2TP packet."""
 
     #: Flags and version info.
@@ -58,4 +59,5 @@ class L2TP(Data):
         #: Header length.
         hdr_len: 'int'
 
-        def __init__(self, flags: 'Flags', version: 'int', length: 'Optional[int]', tunnelid: 'int', sessionid: 'int', ns: 'Optional[int]', nr: 'Optional[int]', offset: 'Optional[int]') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,redefined-builtin,multiple-statements,line-too-long
+        def __init__(self, flags: 'Flags', version: 'int', length: 'Optional[int]', tunnelid: 'int', sessionid: 'int',
+                     ns: 'Optional[int]', nr: 'Optional[int]', offset: 'Optional[int]') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,redefined-builtin,multiple-statements,line-too-long

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/link/ospf.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from ipaddress import IPv4Address
@@ -31,7 +32,7 @@ class CrytographicAuthentication(Data):
 
 
 @info_final
-class OSPF(Data):
+class OSPF(Protocol):
     """Data model for OSPF packet."""
 
     #: Version number.
@@ -53,4 +54,5 @@ class OSPF(Data):
         #: Authentication.
         auth: 'bytes | CrytographicAuthentication'
 
-        def __init__(self, version: 'int', type: 'Packet', len: 'int', router_id: 'IPv4Address', area_id: 'IPv4Address', chksum: 'bytes', autype: 'Authentication') -> 'None': ...  # pylint: disable=super-init-not-called,unused-argument,line-too-long,multiple-statements,redefined-builtin
+        def __init__(self, version: 'int', type: 'Packet', len: 'int', router_id: 'IPv4Address',
+                     area_id: 'IPv4Address', chksum: 'bytes', autype: 'Authentication') -> 'None': ...  # pylint: disable=super-init-not-called,unused-argument,line-too-long,multiple-statements,redefined-builtin

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/link/vlan.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from pcapkit.const.reg.ethertype import EtherType
@@ -29,7 +30,7 @@ class TCI(Data):
 
 
 @info_final
-class VLAN(Data):
+class VLAN(Protocol):
     """Data model for 802.1Q customer VLAN tag type."""
 
     #: Tag control information.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/misc/null.py

@@ -2,13 +2,13 @@
 """data models for no-payload packet"""
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 __all__ = ['NoPayload']
 
 
 @info_final
-class NoPayload(Data):
+class NoPayload(Protocol):
     """No-payload packet is an empty packet."""
 
     # NOTE: We add this method for both type annotation and to mark that this

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/misc/pcap/frame.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import datetime
@@ -31,7 +32,7 @@ class FrameInfo(Data):
 
 
 @info_final
-class Frame(Data):
+class Frame(Protocol):
     """Frame header of PCAP file."""
 
     #: Metadata information.
@@ -51,4 +52,5 @@ class Frame(Data):
         #: Protocol chain.
         protocols: 'str'
 
-        def __init__(self, frame_info: 'FrameInfo', time: 'datetime', number: 'int', time_epoch: 'Decimal', len: 'int', cap_len: 'int') -> 'None': ...  # pylint: disable=unused-argument,multiple-statements,super-init-not-called,line-too-long,redefined-builtin
+        def __init__(self, frame_info: 'FrameInfo', time: 'datetime', number: 'int', time_epoch: 'Decimal',
+                     len: 'int', cap_len: 'int') -> 'None': ...  # pylint: disable=unused-argument,multiple-statements,super-init-not-called,line-too-long,redefined-builtin

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/misc/pcap/header.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from typing_extensions import Literal
@@ -31,7 +32,7 @@ class MagicNumber(Data):
 
 
 @info_final
-class Header(Data):
+class Header(Protocol):
     """Global header of PCAP file."""
 
     #: Magic number.

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/misc/pcapng.py

@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.corekit.multidict import MultiDict
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 from pcapkit.utilities.compat import localcontext
 
 __all__ = [
@@ -59,7 +60,7 @@ if TYPE_CHECKING:
                                                WireGuardKeyLabel)
 
 
-class PCAPNG(Data):
+class PCAPNG(Protocol):
     """Data model for PCAP-NG file blocks."""
 
     #: Block type.
@@ -145,7 +146,8 @@ class SectionHeaderBlock(PCAPNG):
     options: 'OrderedMultiDict[Enum_OptionType, Option]'
 
     if TYPE_CHECKING:
-        def __init__(self, type: 'Enum_BlockType', length: 'int', byteorder: 'Literal["big", "little"]', version: 'VersionInfo',  # pylint: disable=unused-argument
+        def __init__(self, type: 'Enum_BlockType', length: 'int', byteorder: 'Literal["big", "little"]',
+                     version: 'VersionInfo',  # pylint: disable=unused-argument
                      section_length: 'int', options: 'OrderedMultiDict[Enum_OptionType, Option]') -> None: ...
 
 
@@ -255,7 +257,8 @@ class IF_FilterOption(Option):
     expression: 'bytes'
 
     if TYPE_CHECKING:
-        def __init__(self, type: 'Enum_OptionType', length: 'int', code: 'Enum_FilterType', expression: 'bytes') -> None: ...
+        def __init__(self, type: 'Enum_OptionType', length: 'int', code: 'Enum_FilterType',
+                     expression: 'bytes') -> None: ...
 
 
 @info_final
@@ -384,7 +387,8 @@ class EPB_HashOption(Option):
     hash: 'bytes'
 
     if TYPE_CHECKING:
-        def __init__(self, type: 'Enum_OptionType', length: 'int', algorithm: 'Enum_HashAlgorithm', hash: 'bytes') -> 'None': ...
+        def __init__(self, type: 'Enum_OptionType', length: 'int', algorithm: 'Enum_HashAlgorithm',
+                     hash: 'bytes') -> 'None': ...
 
 
 @info_final
@@ -430,7 +434,8 @@ class EPB_VerdictOption(Option):
     value: 'bytes'
 
     if TYPE_CHECKING:
-        def __init__(self, type: 'Enum_OptionType', length: 'int', verdict: 'Enum_VerdictType', value: 'bytes') -> 'None': ...
+        def __init__(self, type: 'Enum_OptionType', length: 'int', verdict: 'Enum_VerdictType',
+                     value: 'bytes') -> 'None': ...
 
 
 @info_final
@@ -623,7 +628,8 @@ class NameResolutionBlock(PCAPNG):
         #: Name resolution mapping (name -> IP address).
         reverse_mapping: 'MultiDict[str, IPv4Address | IPv6Address]'
 
-        def __init__(self, type: 'Enum_BlockType', length: 'int', records: 'OrderedMultiDict[Enum_RecordType, NameResolutionRecord]',
+        def __init__(self, type: 'Enum_BlockType', length: 'int',
+                     records: 'OrderedMultiDict[Enum_RecordType, NameResolutionRecord]',
                      options: 'OrderedMultiDict[Enum_OptionType, Option]') -> 'None': ...
 
 
@@ -736,7 +742,8 @@ class SystemdJournalExportBlock(PCAPNG):
     data: 'tuple[OrderedMultiDict[str, str | bytes], ...]'
 
     if TYPE_CHECKING:
-        def __init__(self, type: 'Enum_BlockType', length: 'int', data: 'tuple[OrderedMultiDict[str, str | bytes], ...]') -> 'None': ...
+        def __init__(self, type: 'Enum_BlockType', length: 'int',
+                     data: 'tuple[OrderedMultiDict[str, str | bytes], ...]') -> 'None': ...
 
 
 class DSBSecrets(Data):
@@ -880,7 +887,8 @@ class PACK_HashOption(Option):
     hash: 'bytes'
 
     if TYPE_CHECKING:
-        def __init__(self, type: 'Enum_OptionType', length: 'int', algorithm: 'Enum_HashAlgorithm', hash: 'bytes') -> 'None': ...
+        def __init__(self, type: 'Enum_OptionType', length: 'int', algorithm: 'Enum_HashAlgorithm',
+                     hash: 'bytes') -> 'None': ...
 
 
 @info_final

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/misc/raw.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
-from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from typing import Optional
@@ -13,15 +13,13 @@ __all__ = ['Raw']
 
 
 @info_final
-class Raw(Data):
+class Raw(Protocol):
     """Raw packet is an unknown protocol."""
 
     #: Original enumeration of this protocol.
     protocol: 'Optional[int]'
-    #: packet data
-    packet: 'bytes'
     #: error instance when parsing packet data
     error: 'Optional[Exception]'
 
     if TYPE_CHECKING:
-        def __init__(self, protocol: 'Optional[int]', packet: 'bytes', error: 'Optional[Exception]') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,multiple-statements
+        def __init__(self, protocol: 'Optional[int]', error: 'Optional[Exception]') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,multiple-statements

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/protocol.py

@@ -11,6 +11,14 @@ __all__ = [
 ]
 
 
+class Protocol(Data):
+    """Root protocol."""
+
+    if TYPE_CHECKING:
+        #: Packet payload.
+        packet: 'bytes'
+
+
 @info_final
 class Packet(Data):
     """Header and payload data."""

{pypcapkit-1.3.1.post7 → pypcapkit-1.3.1.post8}/pcapkit/protocols/data/transport/tcp.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING
 
 from pcapkit.corekit.infoclass import info_final
 from pcapkit.protocols.data.data import Data
+from pcapkit.protocols.data.protocol import Protocol
 
 if TYPE_CHECKING:
     from datetime import timedelta
@@ -67,11 +68,12 @@ class Flags(Data):
     fin: 'bool'
 
     if TYPE_CHECKING:
-        def __init__(self, cwr: 'bool', ece: 'bool', urg: 'bool', ack: 'bool', psh: 'bool', rst: 'bool', syn: 'bool', fin: 'bool') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,multiple-statements,line-too-long,redefined-builtin
+        def __init__(self, cwr: 'bool', ece: 'bool', urg: 'bool', ack: 'bool',
+                     psh: 'bool', rst: 'bool', syn: 'bool', fin: 'bool') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,multiple-statements,line-too-long,redefined-builtin
 
 
 @info_final
-class TCP(Data):
+class TCP(Protocol):
     """Data model for TCP packet."""
 
     #: Source port.
@@ -99,7 +101,8 @@ class TCP(Data):
         #: Connection control flags.
         connection: 'TCP_Flags'
 
-        def __init__(self, srcport: 'AppType', dstport: 'AppType', seq: 'int', ack: 'int', hdr_len: 'int', flags: 'Flags', window_size: 'int', checksum: 'bytes', urgent_pointer: 'int') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,multiple-statements,line-too-long,redefined-builtin
+        def __init__(self, srcport: 'AppType', dstport: 'AppType', seq: 'int', ack: 'int', hdr_len: 'int',
+                     flags: 'Flags', window_size: 'int', checksum: 'bytes', urgent_pointer: 'int') -> 'None': ...  # pylint: disable=unused-argument,super-init-not-called,multiple-statements,line-too-long,redefined-builtin
 
 
 class Option(Data):