pypcapkit 1.3.1.post7__pp38-none-any.whl → 1.3.5.post6__pp38-none-any.whl

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.

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.

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

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

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.

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

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

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.

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

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

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."""

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):

pcapkit/protocols/data/transport/udp.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.apptype import AppType
@@ -13,7 +13,7 @@ __all__ = ['UDP']
 
 
 @info_final
-class UDP(Data):
+class UDP(Protocol):
     """Data model for UDP protocol."""
 
     #: Source port.

pcapkit/protocols/internet/internet.py

@@ -83,7 +83,7 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
     #: c.f. :meth:`self._decode_next_layer <pcapkit.protocols.internet.internet.Internet._decode_next_layer>`
     #: & :meth:`self._import_next_layer <pcapkit.protocols.internet.internet.Internet._import_next_layer>`.
     __proto__ = collections.defaultdict(
-        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),  # type: ignore[return-value,arg-type]
+        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),
         {
             Enum_TransType.HOPOPT:          ModuleDescriptor('pcapkit.protocols.internet.hopopt',     'HOPOPT'),
             Enum_TransType.IPv4:            ModuleDescriptor('pcapkit.protocols.internet.ipv4',       'IPv4'),
@@ -157,7 +157,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
 
     def _decode_next_layer(self, dict_: '_PT', proto: 'Optional[int]' = None,  # pylint: disable=arguments-differ
                            length: 'Optional[int]' = None, *, packet: 'Optional[dict[str, Any]]' = None,
-                           version: 'Literal[4, 6]' = 4, ipv6_exthdr: 'Optional[ProtoChain]' = None) -> '_PT':
+                           version: 'Literal[4, 6]' = 4, ipv6_exthdr: 'Optional[ProtoChain]' = None,
+                           payload: 'Optional[bytes]' = None) -> '_PT':
         r"""Decode next layer extractor.
 
         Arguments:
@@ -167,6 +168,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
             packet: packet info (passed from :meth:`self.unpack <pcapkit.protocols.protocol.Protocol.unpack>`)
             version: IP version
             ipv6_exthdr: protocol chain of IPv6 extension headers
+            payload: payload from packet. If not provided, will extract from
+                :meth:`self.__header__.get_payload <pcapkit.protocols.schema.schema.Schema.get_payload>`
 
         Returns:
             Current protocol with next layer extracted.
@@ -179,7 +182,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
 
         """
         next_ = cast('Protocol',  # type: ignore[redundant-cast]
-                     self._import_next_layer(proto, length, packet=packet, version=version))  # type: ignore[arg-type,misc,call-arg]
+                     self._import_next_layer(proto, length, packet=packet, version=version,
+                                             payload=payload))  # type: ignore[arg-type,misc,call-arg]
         info, chain = next_.info, next_.protochain
 
         # make next layer protocol name
@@ -203,8 +207,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
 
     @beholder  # type: ignore[arg-type]
     def _import_next_layer(self, proto: 'int', length: 'Optional[int]' = None, *,  # pylint: disable=arguments-differ
-                           packet: 'Optional[dict[str, Any]]' = None,
-                           version: 'Literal[4, 6]' = 4, extension: 'bool' = False) -> 'Protocol':
+                           packet: 'Optional[dict[str, Any]]' = None, version: 'Literal[4, 6]' = 4,
+                           extension: 'bool' = False, payload: 'Optional[bytes]' = None) -> 'Protocol':
         """Import next layer extractor.
 
         Arguments:
@@ -213,6 +217,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
             packet: packet info (passed from :meth:`self.unpack <pcapkit.protocols.protocol.Protocol.unpack>`)
             version: IP protocol version
             extension: if is extension header
+            payload: payload from packet. If not provided, will extract from
+                :meth:`self.__header__.get_payload <pcapkit.protocols.schema.schema.Schema.get_payload>`
 
         Returns:
             Instance of next layer.
@@ -221,7 +227,10 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
         if TYPE_CHECKING:
             protocol: 'Type[Protocol]'
 
-        file_ = self.__header__.get_payload()
+        if payload is None:
+            file_ = self.__header__.get_payload()
+        else:
+            file_ = payload
         if length is None:
             length = len(file_)
 

pcapkit/protocols/internet/ipv6.py

@@ -31,11 +31,13 @@ from typing import TYPE_CHECKING
 
 from pcapkit.const.ipv6.extension_header import ExtensionHeader as Enum_ExtensionHeader
 from pcapkit.const.reg.transtype import TransType as Enum_TransType
+from pcapkit.corekit.module import ModuleDescriptor
 from pcapkit.corekit.multidict import OrderedMultiDict
 from pcapkit.corekit.protochain import ProtoChain
 from pcapkit.protocols.data.internet.ipv6 import IPv6 as Data_IPv6
 from pcapkit.protocols.internet.ip import IP
 from pcapkit.protocols.schema.internet.ipv6 import IPv6 as Schema_IPv6
+from pcapkit.utilities.decorators import beholder
 
 if TYPE_CHECKING:
     from enum import IntEnum as StdlibEnum
@@ -46,7 +48,6 @@ if TYPE_CHECKING:
     from typing_extensions import Literal
 
     from pcapkit.protocols.protocol import ProtocolBase as Protocol
-    from pcapkit.protocols.schema.schema import Schema
 
 __all__ = ['IPv6']
 
@@ -310,6 +311,7 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
         _protos = []                # ProtoChain buffer
 
         # traverse if next header is an extensive header
+        payload = self.__header__.get_payload()
         while True:
             try:
                 ex_proto = Enum_ExtensionHeader(proto)
@@ -322,7 +324,8 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
             #     break
 
             # make protocol name
-            next_ = self._import_next_layer(proto, packet=packet, version=6, extension=True)  # type: ignore[misc,call-arg,arg-type]
+            next_ = self._import_next_layer(proto, packet=packet, version=6, extension=True,
+                                            payload=payload)  # type: ignore[misc,call-arg,arg-type]
             info = next_.info
             name = next_.alias.lstrip('IPv6-').lower()
             ipv6.__update__({
@@ -348,6 +351,9 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
                 })
                 break
 
+            # update payload for next extension header
+            payload = payload[next_.length:]
+
         # record real header & payload length (headers exclude)
         ipv6.__update__({
             'hdr_len': hdr_len,
@@ -358,4 +364,49 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
         })
 
         ipv6_exthdr = ProtoChain.from_list(_protos)  # type: ignore[arg-type]
-        return super()._decode_next_layer(ipv6, proto, raw_len, packet=packet, ipv6_exthdr=ipv6_exthdr)
+        return super()._decode_next_layer(ipv6, proto, raw_len, packet=packet, ipv6_exthdr=ipv6_exthdr, payload=payload)
+
+    @beholder  # type: ignore[arg-type]
+    def _import_next_layer(self, proto: 'int', length: 'Optional[int]' = None, *,  # pylint: disable=arguments-differ
+                           packet: 'Optional[dict[str, Any]]' = None, version: 'Literal[4, 6]' = 4,
+                           extension: 'bool' = False, payload: 'Optional[bytes]' = None) -> 'Protocol':
+        """Import next layer extractor.
+
+        Arguments:
+            proto: next layer protocol index
+            length: valid (*non-padding*) length
+            packet: packet info (passed from :meth:`self.unpack <pcapkit.protocols.protocol.Protocol.unpack>`)
+            version: IP protocol version
+            extension: if is extension header
+            payload: payload from packet. If not provided, will extract from
+                :meth:`self.__header__.get_payload <pcapkit.protocols.schema.schema.Schema.get_payload>`
+
+        Returns:
+            Instance of next layer.
+
+        """
+        if TYPE_CHECKING:
+            protocol: 'Type[Protocol]'
+
+        if payload is None:
+            file_ = self.__header__.get_payload()
+        else:
+            file_ = payload
+        if length is None:
+            length = len(file_)
+
+        if length == 0:
+            from pcapkit.protocols.misc.null import \
+                NoPayload as protocol  # isort: skip # pylint: disable=import-outside-toplevel
+        elif self._sigterm:
+            from pcapkit.protocols.misc.raw import \
+                Raw as protocol  # isort: skip # pylint: disable=import-outside-toplevel
+        else:
+            protocol = self.__proto__[proto]  # type: ignore[assignment]
+            if isinstance(protocol, ModuleDescriptor):
+                protocol = protocol.klass  # type: ignore[unreachable]
+                self.__proto__[proto] = protocol  # update mapping upon import
+
+        next_ = protocol(file_, length, version=version, extension=extension,  # type: ignore[abstract]
+                         alias=proto, packet=packet, layer=self._exlayer, protocol=self._exproto)
+        return next_

pcapkit/protocols/internet/ipv6_route.py

@@ -48,14 +48,12 @@ from pcapkit.utilities.warnings import RegistryWarning, warn
 if TYPE_CHECKING:
     from enum import IntEnum as StdlibEnum
     from ipaddress import IPv6Address
-    from typing import IO, Any, Callable, DefaultDict, NoReturn, Optional, Type
+    from typing import IO, Any, Callable, DefaultDict, Optional, Type
 
     from aenum import IntEnum as AenumEnum
     from mypy_extensions import DefaultArg, KwArg, NamedArg
     from typing_extensions import Literal
 
-    from pcapkit.corekit.protochain import ProtoChain
-    from pcapkit.protocols.protocol import ProtocolBase as Protocol
     from pcapkit.protocols.schema.internet.ipv6_route import RoutingType as Schema_RoutingType
 
     TypeParser = Callable[[Schema_RoutingType, NamedArg(Schema_IPv6_Route, 'header')], Data_IPv6_Route]
@@ -402,7 +400,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
         """
         ipv6_route = Data_UnknownType(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             data=schema.data,
@@ -463,7 +461,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
 
         ipv6_route = Data_SourceRoute(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             ip=tuple(schema.ip),
@@ -507,7 +505,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
 
         ipv6_route = Data_Type2(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             ip=schema.ip,
@@ -547,7 +545,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
 
         ipv6_route = Data_RPL(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             cmpr_i=schema.cmpr_i,

pcapkit/protocols/link/link.py

@@ -72,7 +72,7 @@ class Link(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstract-m
     #: c.f. :meth:`self._decode_next_layer <pcapkit.protocols.protocol.Protocol._decode_next_layer>`
     #: & :meth:`self._import_next_layer <pcapkit.protocols.protocol.Protocol._import_next_layer>`.
     __proto__ = collections.defaultdict(
-        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),  # type: ignore[arg-type,return-value]
+        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),
         {
             Enum_EtherType.Address_Resolution_Protocol:         ModuleDescriptor('pcapkit.protocols.link.arp',      'ARP'),
             Enum_EtherType.Reverse_Address_Resolution_Protocol: ModuleDescriptor('pcapkit.protocols.link.rarp',     'RARP'),

pcapkit/protocols/misc/pcap/frame.py

@@ -88,7 +88,7 @@ class Frame(Protocol[Data_Frame, Schema_Frame],
     #: The values should be a tuple representing the module name and class name, or
     #: a :class:`~pcapkit.protocols.protocol.Protocol` subclass.
     __proto__ = collections.defaultdict(
-        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),  # type: ignore[return-value,arg-type]
+        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),
         {
             Enum_LinkType.ETHERNET: ModuleDescriptor('pcapkit.protocols.link', 'Ethernet'),
             Enum_LinkType.IPV4:     ModuleDescriptor('pcapkit.protocols.internet', 'IPv4'),

pcapkit/protocols/misc/pcapng.py

@@ -524,7 +524,7 @@ class PCAPNG(Protocol[Data_PCAPNG, Schema_PCAPNG],
     #: The values should be a tuple representing the module name and class name,
     #: or a :class:`~pcapkit.protocols.protocol.Protocol` subclass.
     __proto__ = collections.defaultdict(
-        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),  # type: ignore[arg-type,return-value]
+        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),
         {
             Enum_LinkType.ETHERNET: ModuleDescriptor('pcapkit.protocols.link', 'Ethernet'),
             Enum_LinkType.IPV4:     ModuleDescriptor('pcapkit.protocols.internet', 'IPv4'),
@@ -862,7 +862,10 @@ class PCAPNG(Protocol[Data_PCAPNG, Schema_PCAPNG],
                 self._byte = self._ctx.section.byteorder
                 packet['byteorder'] = self._byte
             self.__header__ = cast('Schema_PCAPNG', self.__schema__.unpack(self._file, length, packet))  # type: ignore[call-arg,misc]
-        return self.read(length, **kwargs)
+
+        data = self.read(length, **kwargs)
+        data.__update__(packet=self.packet.payload)
+        return data
 
     def read(self, length: 'Optional[int]' = None, *, _read: 'bool' = True,
              _seek_set: 'int' = 0, **kwargs: 'Any') -> 'Data_PCAPNG':

pcapkit/protocols/misc/raw.py

@@ -79,7 +79,6 @@ class Raw(Protocol[Data_Raw, Schema_Raw],
         """
         raw = Data_Raw(
             protocol=alias,
-            packet=self._data,
             error=error,
         )
 

pcapkit/protocols/protocol.py

@@ -116,7 +116,7 @@ class ProtocolBase(Generic[_PT, _ST], metaclass=ProtocolMeta):
     #: The values should be a tuple representing the module name and class name,
     #: or a :class:`Protocol` subclass.
     __proto__: 'DefaultDict[int, ModuleDescriptor[ProtocolBase] | Type[ProtocolBase]]' = collections.defaultdict(
-        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),  # type: ignore[return-value,arg-type]
+        lambda: ModuleDescriptor('pcapkit.protocols.misc.raw', 'Raw'),
     )
 
     ##########################################################################
@@ -520,6 +520,9 @@ class ProtocolBase(Generic[_PT, _ST], metaclass=ProtocolMeta):
         # post-init customisations
         self.__post_init__(file, length, **kwargs)  # type: ignore[arg-type]
 
+        # inject packet payload to the info dict
+        self._info.__update__(packet=self.packet.payload)
+
     @overload
     def __post_init__(self, file: 'IO[bytes] | bytes', length: 'Optional[int]' = ..., **kwargs: 'Any') -> 'None': ...
     @overload

pcapkit/protocols/schema/__init__.py

@@ -50,7 +50,6 @@ __all__ = [
     'HIP_RelayToParameter', 'HIP_RouteViaParameter', 'HIP_FromParameter',
     'HIP_RVSHMACParameter', 'HIP_RelayHMACParameter',
     'IPv4',
-    'IPv4_OptionType',
     'IPv4_UnassignedOption', 'IPv4_EOOLOption', 'IPv4_NOPOption',
     'IPv4_SECOption', 'IPv4_LSROption', 'IPv4_TSOption',
     'IPv4_ESECOption', 'IPv4_RROption', 'IPv4_SIDOption',