pypcapkit 1.0.3.post3__cp38-none-any.whl → 1.1.0__cp38-none-any.whl

pcapkit/__init__.py

@@ -123,4 +123,4 @@ __all__ = [
 ]
 
 #: version number
-__version__ = '1.0.3.post3'
+__version__ = '1.1.0'

pcapkit/corekit/fields/collections.py

@@ -56,7 +56,7 @@ class ListField(_Field[List[_TL]], Generic[_TL]):
     def __init__(self, length: 'int | Callable[[dict[str, Any]], int]' = lambda _: -1,
                  item_type: 'Optional[_Field]' = None,
                  callback: 'Callable[[Self, dict[str, Any]], None]' = lambda *_: None) -> 'None':
-        self._name = '<list>'
+        #self._name = '<list>'
         self._callback = callback
         self._item_type = item_type
 
@@ -75,9 +75,8 @@ class ListField(_Field[List[_TL]], Generic[_TL]):
         Returns:
             Updated field instance.
 
-        Notes:
-            This method will return a new instance of :class:`ListField`
-            instead of updating the current instance.
+        This method will return a new instance of :class:`ListField`
+        instead of updating the current instance.
 
         """
         new_self = copy.copy(self)
@@ -213,7 +212,7 @@ class OptionField(ListField, Generic[_TS]):
                  eool: 'Optional[int | StdlibEnum | AenumEnum]' = None,
                  callback: 'Callable[[Self, dict[str, Any]], None]' = lambda *_: None) -> 'None':
         super().__init__(length, None, callback)
-        self._name = '<option>'
+        #self._name = '<option>'
         self._eool = eool
         self._option_padding = 0
 

pcapkit/corekit/fields/field.py

@@ -16,6 +16,8 @@ if TYPE_CHECKING:
 
     from typing_extensions import Literal, Self
 
+    from pcapkit.protocols.schema.schema import Schema
+
 _T = TypeVar('_T')
 
 
@@ -41,6 +43,10 @@ class _Field(Generic[_T], metaclass=abc.ABCMeta):
         :meth:`~_Field.pack` should be considerate of the template format
         and the actual value provided for packing.
 
+    Args:
+        *args: Arbitrary positional arguments.
+        **kwargs: Arbitrary keyword arguments.
+
     """
 
     if TYPE_CHECKING:
@@ -98,9 +104,8 @@ class _Field(Generic[_T], metaclass=abc.ABCMeta):
         Returns:
             Updated field instance.
 
-        Notes:
-            This method will return a new instance of :class:`_Field` instead of
-            updating the current instance.
+        This method will return a new instance of :class:`_Field` instead of
+        updating the current instance.
 
         """
         new_self = copy.copy(self)
@@ -109,7 +114,9 @@ class _Field(Generic[_T], metaclass=abc.ABCMeta):
 
     # NOTE: This method is created as a placeholder for the necessary attributes.
     def __init__(self, *args: 'Any', **kwargs: 'Any') -> 'None':
-        self._name = f'<{type(self).__name__[:-5].lower()}>'
+        if not hasattr(self, '_name'):
+            self._name = f'<{type(self).__name__[:-5].lower()}>'
+
         self._default = NoValue
         self._template = '0s'
         self._callback = lambda *_: None
@@ -119,6 +126,22 @@ class _Field(Generic[_T], metaclass=abc.ABCMeta):
             return f'<{self.__class__.__name__}>'
         return f'<{self.__class__.__name__} {self.name}>'
 
+    def __set_name__(self, owner: 'Schema', name: 'str') -> 'None':
+        """Set field name and update field list (if applicable).
+
+        This method is to be called by the metaclass during class creation.
+        It is used to set the field name and update the field list, i.e.,
+        :attr:`Schema.__fields__ <pcapkit.protocols.schema.schema.Schema.__fields__>`
+        mapping dictionary.
+
+        """
+        # Update field list (if applicable)
+        if hasattr(owner, '__fields__'):
+            owner.__fields__[name] = self
+
+        # Set field name
+        self.name = name
+
     def pre_process(self, value: '_T', packet: 'dict[str, Any]') -> 'Any':  # pylint: disable=unused-argument
         """Process field value before construction (packing).
 
@@ -204,7 +227,10 @@ class Field(_Field[_T], Generic[_T]):
     def __init__(self, length: 'int | Callable[[dict[str, Any]], int]',
                  default: '_T | NoValueType' = NoValue,
                  callback: 'Callable[[Self, dict[str, Any]], None]' = lambda *_: None) -> 'None':
-        self._name = '<unknown>'
+        #self._name = '<unknown>'
+        if not hasattr(self, '_name'):
+            self._name = f'<{type(self).__name__[:-5].lower()}>'
+
         self._default = default
         self._callback = callback
 
@@ -222,9 +248,8 @@ class Field(_Field[_T], Generic[_T]):
         Returns:
             New instance of :class:`Field`.
 
-        Notes:
-            This method will return a new instance of :class:`Field` instead of
-            updating the current instance.
+        This method will return a new instance of :class:`Field` instead of
+        updating the current instance.
 
         """
         new_self = copy.copy(self)

pcapkit/corekit/fields/ipaddress.py

@@ -3,7 +3,6 @@
 
 import abc
 import ipaddress
-from sys import prefix
 from typing import TYPE_CHECKING, Generic, TypeVar, cast
 
 from pcapkit.corekit.fields.field import _T, Field, NoValue

pcapkit/corekit/fields/misc.py

@@ -141,9 +141,8 @@ class ConditionalField(_Field[_TC]):
         Returns:
             Updated field instance.
 
-        Notes:
-            This method will return a new instance of :class:`ConditionalField`
-            instead of updating the current instance.
+        This method will return a new instance of :class:`ConditionalField`
+        instead of updating the current instance.
 
         """
         new_self = copy.copy(self)
@@ -273,7 +272,7 @@ class PayloadField(_Field[_TP]):
                  default: '_TP | NoValueType | bytes' = NoValue,
                  protocol: 'Optional[Type[_TP]]' = None,
                  callback: 'Callable[[Self, dict[str, Any]], None]' = lambda *_: None) -> 'None':
-        self._name = '<payload>'
+        #self._name = '<payload>'
         self._default = default  # type: ignore[assignment]
         self._protocol = protocol  # type: ignore[assignment]
         self._callback = callback
@@ -293,9 +292,8 @@ class PayloadField(_Field[_TP]):
         Returns:
             Updated field instance.
 
-        Notes:
-            This method will return a new instance of :class:`PayloadField`
-            instead of updating the current instance.
+        This method will return a new instance of :class:`PayloadField`
+        instead of updating the current instance.
 
         """
         new_self = copy.copy(self)
@@ -409,7 +407,7 @@ class SwitchField(_Field[_TC]):
         return self._field
 
     def __init__(self, selector: 'Callable[[dict[str, Any]], _Field[_TC]]' = lambda _: NoValueField()) -> 'None':  # type: ignore[assignment,return-value]
-        self._name = '<switch>'
+        #self._name = '<switch>'
         self._field = cast('_Field[_TC]', NoValueField())
         self._selector = selector
 
@@ -422,9 +420,8 @@ class SwitchField(_Field[_TC]):
         Returns:
             New field instance.
 
-        Notes:
-            This method will return a new instance of :class:`SwitchField`
-            instead of updating the current instance.
+        This method will return a new instance of :class:`SwitchField`
+        instead of updating the current instance.
 
         """
         new_self = copy.copy(self)
@@ -527,7 +524,7 @@ class SchemaField(_Field[_TS]):
                  default: '_TS | NoValueType | bytes' = NoValue,
                  packet: 'Optional[dict[str, Any]]' = None,
                  callback: 'Callable[[Self, dict[str, Any]], None]' = lambda *_: None) -> 'None':
-        self._name = '<schema>'
+        #self._name = '<schema>'
         self._callback = callback
 
         if packet is None:
@@ -557,9 +554,8 @@ class SchemaField(_Field[_TS]):
         Returns:
             New field instance.
 
-        Notes:
-            This method will return a new instance of :class:`SchemaField`
-            instead of updating the current instance.
+        This method will return a new instance of :class:`SchemaField`
+        instead of updating the current instance.
 
         """
         new_self = copy.copy(self)
@@ -679,7 +675,7 @@ class ForwardMatchField(_Field[_TC]):
         return self._field
 
     def __init__(self, field: '_Field[_TC]') -> 'None':
-        self._name = '<forward_match>'
+        #self._name = '<forward_match>'
         self._field = field
 
     def __call__(self, packet: 'dict[str, Any]') -> 'Self':
@@ -691,9 +687,8 @@ class ForwardMatchField(_Field[_TC]):
         Returns:
             Updated field instance.
 
-        Notes:
-            This method will return a new instance of :class:`ConditionalField`
-            instead of updating the current instance.
+        This method will return a new instance of :class:`ConditionalField`
+        instead of updating the current instance.
 
         """
         new_self = copy.copy(self)

pcapkit/corekit/fields/numbers.py

@@ -92,9 +92,8 @@ class NumberField(Field[int], Generic[_T]):
         Returns:
             New instance of :class:`NumberField`.
 
-        Notes:
-            This method will return a new instance of :class:`NumberField` instead of
-            updating the current instance.
+        This method will return a new instance of :class:`NumberField` instead of
+        updating the current instance.
 
         """
         new_self = super().__call__(packet)

pcapkit/corekit/fields/strings.py

@@ -56,9 +56,8 @@ class _TextField(Field[_T], Generic[_T]):
         Returns:
             New instance of :class:`_TextField`.
 
-        Notes:
-            This method will return a new instance of :class:`_TextField` instead of
-            updating the current instance.
+        This method will return a new instance of :class:`_TextField` instead of
+        updating the current instance.
 
         """
         new_self = super().__call__(packet)

pcapkit/corekit/infoclass.py

@@ -10,6 +10,7 @@ designed to work alike :func:`dataclasses.dataclass` as introduced
 in :pep:`557`.
 
 """
+import abc
 import collections.abc
 import enum
 import itertools
@@ -49,6 +50,11 @@ def info_final(cls: 'ST', *, _finalised: 'bool' = True) -> 'ST':
     class. It can be useful to reduce runtime generation
     time as well as caching already generated attributes.
 
+    Notes:
+        The decorator should only be used on the *final*
+        class, otherwise, any subclasses derived from a
+        finalised info class will not be re-finalised.
+
     Args:
         cls: Info class.
         _finalised: Whether to make the info class as finalised.
@@ -56,11 +62,6 @@ def info_final(cls: 'ST', *, _finalised: 'bool' = True) -> 'ST':
     Returns:
         Finalised info class.
 
-    Notes:
-        The decorator should only be used on the *final*
-        class, otherwise, any subclasses derived from a
-        finalised info class will not be re-finalised.
-
     :meta decorator:
     """
     if cls.__finalised__ == FinalisedState.FINAL:
@@ -140,7 +141,59 @@ def info_final(cls: 'ST', *, _finalised: 'bool' = True) -> 'ST':
     return final(cls)
 
 
-class Info(Mapping[str, VT], Generic[VT]):
+class InfoMeta(abc.ABCMeta):
+    """Meta class to add dynamic support to :class:`Info`.
+
+    This meta class is used to generate necessary attributes for the
+    :class:`Info` class. It can be useful to reduce runtime generation
+    cost as well as caching already generated attributes.
+
+    * :attr:`Info.__additional__` and :attr:`Info.__excluded__` are
+      lists of additional and excluded field names, which are used to
+      determine certain names to be included or excluded from the field
+      dictionary. They will be automatically populated from the class
+      attributes of the :class:`Info` class and its base classes.
+
+      .. note::
+
+         This is implemented thru the :meth:`__new__` method, which will
+         inherit the additional and excluded field names from the base
+         classes, as well as populating the additional and excluded field
+         from the subclass attributes.
+
+         .. code-block:: python
+
+            class A(Info):
+                __additional__ = ['a', 'b']
+
+            class B(A):
+                __additional__ = ['c', 'd']
+
+            class C(B):
+                __additional__ = ['e', 'f']
+
+            print(A.__additional__)  # ['a', 'b']
+            print(B.__additional__)  # ['a', 'b', 'c', 'd']
+            print(C.__additional__)  # ['a', 'b', 'c', 'd', 'e', 'f']
+
+    """
+
+    def __new__(cls, name: 'str', bases: 'tuple[type, ...]', attrs: 'dict[str, Any]', **kwargs: 'Any') -> 'Type[Info]':
+        if '__additional__' not in attrs:
+            attrs['__additional__'] = []
+        if '__excluded__' not in attrs:
+            attrs['__excluded__'] = []
+
+        for base in bases:
+            if hasattr(base, '__additional__'):
+                attrs['__additional__'].extend(
+                    name for name in base.__additional__ if name not in attrs['__additional__'])
+            if hasattr(base, '__excluded__'):
+                attrs['__excluded__'].extend(name for name in base.__excluded__ if name not in attrs['__excluded__'])
+        return super().__new__(cls, name, bases, attrs, **kwargs)  # type: ignore[return-value]
+
+
+class Info(Mapping[str, VT], Generic[VT], metaclass=InfoMeta):
     """Turn dictionaries into :obj:`object` like instances.
 
     * :class:`Info` objects inherit from :obj:`dict` type

pcapkit/corekit/protochain.py

@@ -26,7 +26,14 @@ __all__ = ['ProtoChain']
 
 
 class ProtoChain(collections.abc.Sequence):
-    """Protocols chain."""
+    """Protocols chain.
+
+    Args:
+        proto: New protocol class on the top stack.
+        alias: New protocol alias on the top stack.
+        basis: Original protocol chain as base stacks.
+
+    """
 
     #: Internal data storage for protocol chain.
     __data__: 'tuple[tuple[str, Type[Protocol]], ...]'

pcapkit/foundation/registry/protocols.py

@@ -8,7 +8,7 @@ This module provides the protocol registries for :mod:`pcapkit`.
 
 """
 import importlib
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from pcapkit.protocols import __proto__ as protocol_registry
 from pcapkit.protocols.application.httpv2 import HTTP as HTTPv2
@@ -23,21 +23,23 @@ from pcapkit.protocols.link.link import Link
 from pcapkit.protocols.misc.pcap.frame import Frame
 from pcapkit.protocols.misc.pcapng import PCAPNG
 from pcapkit.protocols.protocol import Protocol
-from pcapkit.protocols.schema.application.httpv2 import MAP_HTTP_FRAME
-from pcapkit.protocols.schema.internet.hip import HIP as Schema_HIP
-from pcapkit.protocols.schema.internet.hopopt import HOPOPT as Schema_HOPOPT
-from pcapkit.protocols.schema.internet.ipv4 import IPv4 as Schema_IPv4
-from pcapkit.protocols.schema.internet.ipv6_opts import IPv6_Opts as Schema_IPv6_Opts
-from pcapkit.protocols.schema.internet.ipv6_route import MAP_IPV6_ROUTE_DATA
-from pcapkit.protocols.schema.internet.mh import MAP_MH_DATA
-from pcapkit.protocols.schema.internet.mh import CGAParameter as Schema_MH_CGAParameter
+from pcapkit.protocols.schema.application.httpv2 import FrameType as Schema_HTTP_FrameType
+from pcapkit.protocols.schema.internet.hip import Parameter as Schema_HIP_Parameter
+from pcapkit.protocols.schema.internet.hopopt import Option as Schema_HOPOPT_Option
+from pcapkit.protocols.schema.internet.ipv4 import Option as Schema_IPv4_Option
+from pcapkit.protocols.schema.internet.ipv6_opts import Option as Schema_IPv6_Opts_Option
+from pcapkit.protocols.schema.internet.ipv6_route import \
+    RoutingType as Schema_IPv6_Route_RoutingType
+from pcapkit.protocols.schema.internet.mh import CGAExtension as Schema_MH_CGAExtension
+from pcapkit.protocols.schema.internet.mh import Option as Schema_MH_Option
 from pcapkit.protocols.schema.internet.mh import Packet as Schema_MH_Packet
-from pcapkit.protocols.schema.misc.pcapng import MAP_DSB_SECRETS, MAP_PCAPNG_BLOCK
 from pcapkit.protocols.schema.misc.pcapng import BlockType as Schema_PCAPNG_BlockType
+from pcapkit.protocols.schema.misc.pcapng import DSBSecrets as Schema_PCAPNG_DSBSecrets
 from pcapkit.protocols.schema.misc.pcapng import \
-    NameResolutionBlock as Schema_PCAPNG_NameResolutionBlock
-from pcapkit.protocols.schema.transport.tcp import MAP_MPTCP_DATA
-from pcapkit.protocols.schema.transport.tcp import TCP as Schema_TCP
+    NameResolutionRecord as Schema_PCAPNG_NameResolutionRecord
+from pcapkit.protocols.schema.misc.pcapng import Option as Schema_PCAPNG_Option
+from pcapkit.protocols.schema.transport.tcp import MPTCP as Schema_TCP_MPTCP
+from pcapkit.protocols.schema.transport.tcp import Option as Schema_TCP_Option
 from pcapkit.protocols.transport.tcp import TCP
 from pcapkit.protocols.transport.udp import UDP
 from pcapkit.utilities.exceptions import RegistryError
@@ -65,7 +67,6 @@ if TYPE_CHECKING:
     from pcapkit.const.reg.transtype import TransType
     from pcapkit.const.tcp.mp_tcp_option import MPTCPOption as TCP_MPTCPOption
     from pcapkit.const.tcp.option import Option as TCP_Option
-    from pcapkit.corekit.fields.collections import OptionField
     from pcapkit.protocols.application.httpv2 import FrameConstructor as HTTP_FrameConstructor
     from pcapkit.protocols.application.httpv2 import FrameParser as HTTP_FrameParser
     from pcapkit.protocols.internet.hip import ParameterConstructor as HIP_ParameterConstructor
@@ -93,22 +94,6 @@ if TYPE_CHECKING:
     from pcapkit.protocols.misc.pcapng import RecordParser as PCAPNG_RecordParser
     from pcapkit.protocols.misc.pcapng import SecretsConstructor as PCAPNG_SecretsConstructor
     from pcapkit.protocols.misc.pcapng import SecretsParser as PCAPNG_SecretsParser
-    from pcapkit.protocols.schema.application.httpv2 import FrameType as Schema_HTTP_FrameType
-    from pcapkit.protocols.schema.internet.hip import Parameter as Schema_HIP_Parameter
-    from pcapkit.protocols.schema.internet.hopopt import Option as Schema_HOPOPT_Option
-    from pcapkit.protocols.schema.internet.ipv4 import Option as Schema_IPv4_Option
-    from pcapkit.protocols.schema.internet.ipv6_opts import Option as Schema_IPv6_Opts_Option
-    from pcapkit.protocols.schema.internet.ipv6_route import \
-        RoutingType as Schema_IPv6_Route_RoutingType
-    from pcapkit.protocols.schema.internet.mh import CGAExtension as Schema_MH_CGAExtension
-    from pcapkit.protocols.schema.internet.mh import Option as Schema_MH_Option
-    from pcapkit.protocols.schema.internet.mh import Packet as Schema_MH_Packet
-    from pcapkit.protocols.schema.misc.pcapng import DSBSecrets as Schema_PCAPNG_DSBSecrets
-    from pcapkit.protocols.schema.misc.pcapng import \
-        NameResolutionRecord as Schema_PCAPNG_NameResolutionRecord
-    from pcapkit.protocols.schema.misc.pcapng import Option as Schema_PCAPNG_Option
-    from pcapkit.protocols.schema.transport.tcp import MPTCP as Schema_TCP_MPTCP
-    from pcapkit.protocols.schema.transport.tcp import Option as Schema_TCP_Option
     from pcapkit.protocols.transport.tcp import MPOptionConstructor as TCP_MPOptionConstructor
     from pcapkit.protocols.transport.tcp import MPOptionParser as TCP_MPOptionParser
     from pcapkit.protocols.transport.tcp import OptionConstructor as TCP_OptionConstructor
@@ -340,7 +325,7 @@ def register_ipv4_option(code: 'IPv4_OptionNumber', meth: 'str | tuple[IPv4_Opti
 
     IPv4.register_option(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_IPv4_Option]', Schema_IPv4.options).registry[code] = schema
+        Schema_IPv4_Option.register(code, schema)
     logger.info('registered IPv4 option parser: %s', code.name)
 
 
@@ -365,7 +350,7 @@ def register_hip_parameter(code: 'HIP_Parameter', meth: 'str | tuple[HIP_Paramet
 
     HIP.register_parameter(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_HIP_Parameter]', Schema_HIP.param).registry[code] = schema
+        Schema_HIP_Parameter.register(code, schema)
     logger.info('registered HIP parameter parser: %s', code.name)
 
 
@@ -390,7 +375,7 @@ def register_hopopt_option(code: 'IPv6_Option', meth: 'str | tuple[HOPOPT_Option
 
     HOPOPT.register_option(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_HOPOPT_Option]', Schema_HOPOPT.options).registry[code] = schema
+        Schema_HOPOPT_Option.register(code, schema)
     logger.info('registered HOPOPT option parser: %s', code.name)
 
 
@@ -415,7 +400,7 @@ def register_ipv6_opts_option(code: 'IPv6_Option', meth: 'str | tuple[IPv6_Opts_
 
     IPv6_Opts.register_option(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_IPv6_Opts_Option]', Schema_IPv6_Opts.options).registry[code] = schema
+        Schema_IPv6_Opts_Option.register(code, schema)
     logger.info('registered IPv6-Opts option parser: %s', code.name)
 
 
@@ -440,7 +425,7 @@ def register_ipv6_route_routing(code: 'IPv6_Routing', meth: 'str | tuple[IPv6_Ro
 
     IPv6_Route.register_routing(code, meth)
     if schema is not None:
-        MAP_IPV6_ROUTE_DATA[code] = schema
+        Schema_IPv6_Route_RoutingType.register(code, schema)
     logger.info('registered IPv6-Route routing data parser: %s', code.name)
 
 
@@ -465,7 +450,7 @@ def register_mh_message(code: 'MH_Packet', meth: 'str | tuple[MH_PacketParser, M
 
     MH.register_message(code, meth)
     if schema is not None:
-        MAP_MH_DATA[code] = schema
+        Schema_MH_Packet.register(code, schema)
     logger.info('registered MH message type parser: %s', code.name)
 
 
@@ -490,10 +475,7 @@ def register_mh_option(code: 'MH_Option', meth: 'str | tuple[MH_OptionParser, MH
 
     MH.register_option(code, meth)
     if schema is not None:
-        for subclass in Schema_MH_Packet.__subclasses__():
-            if not hasattr(subclass, 'options'):
-                continue
-            cast('OptionField[Schema_MH_Option]', subclass.options).registry[code] = schema
+        Schema_MH_Option.register(code, schema)
     logger.info('registered MH option parser: %s', code.name)
 
 
@@ -518,7 +500,7 @@ def register_mh_extension(code: 'MH_CGAExtension', meth: 'str | tuple[MH_Extensi
 
     MH.register_extension(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_MH_CGAExtension]', Schema_MH_CGAParameter.extensions).registry[code] = schema
+        Schema_MH_CGAExtension.register(code, schema)
     logger.info('registered MH CGA extension: %s', code.name)
 
 
@@ -616,7 +598,7 @@ def register_tcp_option(code: 'TCP_Option', meth: 'str | tuple[TCP_OptionParser,
 
     TCP.register_option(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_TCP_Option]', Schema_TCP.options).registry[code] = schema
+        Schema_TCP_Option.register(code, schema)
     logger.info('registered TCP option parser: %s', code.name)
 
 
@@ -641,7 +623,7 @@ def register_tcp_mp_option(code: 'TCP_MPTCPOption', meth: 'str | tuple[TCP_MPOpt
 
     TCP.register_mp_option(code, meth)
     if schema is not None:
-        MAP_MPTCP_DATA[code] = schema
+        Schema_TCP_MPTCP.register(code, schema)
     logger.info('registered MPTCP option parser: %s', code.name)
 
 
@@ -699,7 +681,7 @@ def register_http_frame(code: 'HTTP_Frame', meth: 'str | tuple[HTTP_FrameParser,
 
     HTTPv2.register_frame(code, meth)
     if schema is not None:
-        MAP_HTTP_FRAME[code] = schema
+        Schema_HTTP_FrameType.register(code, schema)
     logger.info('registered HTTP/2 frame parser: %s', code.name)
 
 
@@ -729,7 +711,7 @@ def register_pcapng_block(code: 'PCAPNG_BlockType', meth: 'str | tuple[PCAPNG_Bl
 
     PCAPNG.register_block(code, meth)
     if schema is not None:
-        MAP_PCAPNG_BLOCK[code] = schema
+        Schema_PCAPNG_BlockType.register(code, schema)
     logger.info('registered PCAP-NG block parser: %s', code.name)
 
 
@@ -754,10 +736,7 @@ def register_pcapng_option(code: 'PCAPNG_OptionType', meth: 'str | tuple[PCAPNG_
 
     PCAPNG.register_option(code, meth)
     if schema is not None:
-        for subclass in Schema_PCAPNG_BlockType.__subclasses__():
-            if not hasattr(subclass, 'options'):
-                continue
-            cast('OptionField[Schema_PCAPNG_Option]', subclass.options).registry[code] = schema
+        Schema_PCAPNG_Option.register(code, schema)
     logger.info('registered PCAP-NG option parser: %s', code.name)
 
 
@@ -783,7 +762,7 @@ def register_pcapng_record(code: 'PCAPNG_RecordType', meth: 'str | tuple[PCAPNG_
 
     PCAPNG.register_record(code, meth)
     if schema is not None:
-        cast('OptionField[Schema_PCAPNG_NameResolutionRecord]', Schema_PCAPNG_NameResolutionBlock.records).registry[code] = schema
+        Schema_PCAPNG_NameResolutionRecord.register(code, schema)
     logger.info('registered PCAP-NG name resolution record parser: %s', code.name)
 
 
@@ -808,5 +787,5 @@ def register_pcapng_secrets(code: 'PCAPNG_SecretsType', meth: 'str | tuple[PCAPN
 
     PCAPNG.register_secrets(code, meth)
     if schema is not None:
-        MAP_DSB_SECRETS[code] = schema
+        Schema_PCAPNG_DSBSecrets.register(code, schema)
     logger.info('registered PCAP-NG decryption secrets parser: %s', code.name)

pcapkit/protocols/data/__init__.py

@@ -138,8 +138,8 @@ __all__ = [
     'MH_HomeTestMessage', 'MH_CareofTestMessage', 'MH_BindingUpdateMessage', 'MH_BindingAcknowledgementMessage',
     'MH_BindingErrorMessage',
     'MH_Option',
-    'MH_UnassignedOption', 'MH_PadOption', 'MH_BindRefreshAdviceOption', 'MH_AlternateCareofAddressOption',
-    'MH_NonceIndicesOption', 'MH_BindingAuthorizationDataOption', 'MH_MobileNetworkPrefixOption',
+    'MH_UnassignedOption', 'MH_PadOption', 'MH_BindingRefreshAdviceOption', 'MH_AlternateCareofAddressOption',
+    'MH_NonceIndicesOption', 'MH_AuthorizationDataOption', 'MH_MobileNetworkPrefixOption',
     'MH_LinkLayerAddressOption', 'MH_MNIDOption', 'MH_AuthOption', 'MH_MesgIDOption', 'MH_CGAParametersRequestOption',
     'MH_CGAParametersOption', 'MH_SignatureOption', 'MH_PermanentHomeKeygenTokenOption', 'MH_CareofTestInitOption',
     'MH_CareofTestOption',
@@ -152,8 +152,8 @@ __all__ = [
     'TCP_Flags', 'TCP_SACKBlock',
     'TCP_Option',
     'TCP_UnassignedOption', 'TCP_EndOfOptionList', 'TCP_NoOperation', 'TCP_MaximumSegmentSize', 'TCP_WindowScale',
-    'TCP_SACKPermitted', 'TCP_SACK', 'TCP_Echo', 'TCP_EchoReply', 'TCP_Timestamp', 'TCP_PartialOrderConnectionPermitted',  # pylint: disable=line-too-long
-    'TCP_PartialOrderConnectionProfile', 'TCP_CC', 'TCP_CCNew', 'TCP_CCEcho', 'TCP_AlternateChecksumRequest',
+    'TCP_SACKPermitted', 'TCP_SACK', 'TCP_Echo', 'TCP_EchoReply', 'TCP_Timestamps', 'TCP_PartialOrderConnectionPermitted',  # pylint: disable=line-too-long
+    'TCP_PartialOrderServiceProfile', 'TCP_CC', 'TCP_CCNew', 'TCP_CCEcho', 'TCP_AlternateChecksumRequest',
     'TCP_AlternateChecksumData', 'TCP_MD5Signature', 'TCP_QuickStartResponse', 'TCP_UserTimeout',
     'TCP_Authentication', 'TCP_FastOpenCookie',
     'TCP_MPTCPCapableFlag',

pcapkit/protocols/data/internet/__init__.py

@@ -179,12 +179,12 @@ from pcapkit.protocols.data.internet.mh import AuthOption as MH_AuthOption
 from pcapkit.protocols.data.internet.mh import \
     BindingAcknowledgementMessage as MH_BindingAcknowledgementMessage
 from pcapkit.protocols.data.internet.mh import \
-    BindingAuthorizationDataOption as MH_BindingAuthorizationDataOption
+    AuthorizationDataOption as MH_AuthorizationDataOption
 from pcapkit.protocols.data.internet.mh import BindingErrorMessage as MH_BindingErrorMessage
 from pcapkit.protocols.data.internet.mh import \
     BindingRefreshRequestMessage as MH_BindingRefreshRequestMessage
 from pcapkit.protocols.data.internet.mh import BindingUpdateMessage as MH_BindingUpdateMessage
-from pcapkit.protocols.data.internet.mh import BindRefreshAdviceOption as MH_BindRefreshAdviceOption
+from pcapkit.protocols.data.internet.mh import BindingRefreshAdviceOption as MH_BindingRefreshAdviceOption
 from pcapkit.protocols.data.internet.mh import CareofTestInitMessage as MH_CareofTestInitMessage
 from pcapkit.protocols.data.internet.mh import CareofTestInitOption as MH_CareofTestInitOption
 from pcapkit.protocols.data.internet.mh import CareofTestMessage as MH_CareofTestMessage
@@ -287,8 +287,8 @@ __all__ = [
     'MH_HomeTestMessage', 'MH_CareofTestMessage', 'MH_BindingUpdateMessage', 'MH_BindingAcknowledgementMessage',
     'MH_BindingErrorMessage',
     'MH_Option',
-    'MH_UnassignedOption', 'MH_PadOption', 'MH_BindRefreshAdviceOption', 'MH_AlternateCareofAddressOption',
-    'MH_NonceIndicesOption', 'MH_BindingAuthorizationDataOption', 'MH_MobileNetworkPrefixOption',
+    'MH_UnassignedOption', 'MH_PadOption', 'MH_BindingRefreshAdviceOption', 'MH_AlternateCareofAddressOption',
+    'MH_NonceIndicesOption', 'MH_AuthorizationDataOption', 'MH_MobileNetworkPrefixOption',
     'MH_LinkLayerAddressOption', 'MH_MNIDOption', 'MH_AuthOption', 'MH_MesgIDOption', 'MH_CGAParametersRequestOption',
     'MH_CGAParametersOption', 'MH_SignatureOption', 'MH_PermanentHomeKeygenTokenOption', 'MH_CareofTestInitOption',
     'MH_CareofTestOption',

pcapkit/protocols/data/internet/mh.py

@@ -70,8 +70,8 @@ __all__ = [
     'BindingErrorMessage',
 
     'Option',
-    'UnassignedOption', 'PadOption', 'BindRefreshAdviceOption', 'AlternateCareofAddressOption',
-    'NonceIndicesOption', 'BindingAuthorizationDataOption', 'MobileNetworkPrefixOption',
+    'UnassignedOption', 'PadOption', 'BindingRefreshAdviceOption', 'AlternateCareofAddressOption',
+    'NonceIndicesOption', 'AuthorizationDataOption', 'MobileNetworkPrefixOption',
     'LinkLayerAddressOption', 'MNIDOption', 'AuthOption', 'MesgIDOption', 'CGAParametersRequestOption',
     'CGAParametersOption', 'SignatureOption', 'PermanentHomeKeygenTokenOption', 'CareofTestInitOption',
     'CareofTestOption',
@@ -281,7 +281,7 @@ class PadOption(Option):
 
 
 @info_final
-class BindRefreshAdviceOption(Option):
+class BindingRefreshAdviceOption(Option):
     """Data model for Binding Refresh Advice option."""
 
     #: Refresh interval.
@@ -316,7 +316,7 @@ class NonceIndicesOption(Option):
 
 
 @info_final
-class BindingAuthorizationDataOption(Option):
+class AuthorizationDataOption(Option):
     """Data model for Binding Authorization Data option."""
 
     #: Authenticator.