pypcapkit 1.0.3__cp310-none-any.whl → 1.1.0__cp310-none-any.whl

pcapkit/protocols/internet/mh.py

@@ -78,15 +78,15 @@ from pcapkit.protocols.data.internet.mh import \
     AlternateCareofAddressOption as Data_AlternateCareofAddressOption
 from pcapkit.protocols.data.internet.mh import AuthOption as Data_AuthOption
 from pcapkit.protocols.data.internet.mh import \
-    BindingAcknowledgementMessage as Data_BindingAcknowledgementMessage
+    AuthorizationDataOption as Data_AuthorizationDataOption
 from pcapkit.protocols.data.internet.mh import \
-    BindingAuthorizationDataOption as Data_BindingAuthorizationDataOption
+    BindingAcknowledgementMessage as Data_BindingAcknowledgementMessage
 from pcapkit.protocols.data.internet.mh import BindingErrorMessage as Data_BindingErrorMessage
+from pcapkit.protocols.data.internet.mh import \
+    BindingRefreshAdviceOption as Data_BindingRefreshAdviceOption
 from pcapkit.protocols.data.internet.mh import \
     BindingRefreshRequestMessage as Data_BindingRefreshRequestMessage
 from pcapkit.protocols.data.internet.mh import BindingUpdateMessage as Data_BindingUpdateMessage
-from pcapkit.protocols.data.internet.mh import \
-    BindRefreshAdviceOption as Data_BindRefreshAdviceOption
 from pcapkit.protocols.data.internet.mh import CareofTestInitMessage as Data_CareofTestInitMessage
 from pcapkit.protocols.data.internet.mh import CareofTestInitOption as Data_CareofTestInitOption
 from pcapkit.protocols.data.internet.mh import CareofTestMessage as Data_CareofTestMessage
@@ -118,15 +118,15 @@ from pcapkit.protocols.schema.internet.mh import \
     AlternateCareofAddressOption as Schema_AlternateCareofAddressOption
 from pcapkit.protocols.schema.internet.mh import AuthOption as Schema_AuthOption
 from pcapkit.protocols.schema.internet.mh import \
-    BindingAcknowledgementMessage as Schema_BindingAcknowledgementMessage
+    AuthorizationDataOption as Schema_AuthorizationDataOption
 from pcapkit.protocols.schema.internet.mh import \
-    BindingAuthorizationDataOption as Schema_BindingAuthorizationDataOption
+    BindingAcknowledgementMessage as Schema_BindingAcknowledgementMessage
 from pcapkit.protocols.schema.internet.mh import BindingErrorMessage as Schema_BindingErrorMessage
+from pcapkit.protocols.schema.internet.mh import \
+    BindingRefreshAdviceOption as Schema_BindingRefreshAdviceOption
 from pcapkit.protocols.schema.internet.mh import \
     BindingRefreshRequestMessage as Schema_BindingRefreshRequestMessage
 from pcapkit.protocols.schema.internet.mh import BindingUpdateMessage as Schema_BindingUpdateMessage
-from pcapkit.protocols.schema.internet.mh import \
-    BindRefreshAdviceOption as Schema_BindRefreshAdviceOption
 from pcapkit.protocols.schema.internet.mh import \
     CareofTestInitMessage as Schema_CareofTestInitMessage
 from pcapkit.protocols.schema.internet.mh import CareofTestInitOption as Schema_CareofTestInitOption
@@ -1125,8 +1125,8 @@ class MH(Internet[Data_MH, Schema_MH],
         )
         return data
 
-    def _read_opt_bra(self, schema: 'Schema_BindRefreshAdviceOption', *,
-                      options: 'Option') -> 'Data_BindRefreshAdviceOption':
+    def _read_opt_bra(self, schema: 'Schema_BindingRefreshAdviceOption', *,
+                      options: 'Option') -> 'Data_BindingRefreshAdviceOption':
         """Read MH binding refresh advice option.
 
         Structure of MH Binding Refresh Advice option [:rfc:`6275`]:
@@ -1152,7 +1152,7 @@ class MH(Internet[Data_MH, Schema_MH],
         if schema.length != 2:
             raise ProtocolError(f'{self.alias}: [Opt {schema.type}] invalid format')
 
-        data = Data_BindRefreshAdviceOption(
+        data = Data_BindingRefreshAdviceOption(
             type=schema.type,
             length=schema.length + 2,
             interval=schema.interval,
@@ -1234,8 +1234,8 @@ class MH(Internet[Data_MH, Schema_MH],
         )
         return data
 
-    def _read_opt_bad(self, schema: 'Schema_BindingAuthorizationDataOption', *,
-                      options: 'Option') -> 'Data_BindingAuthorizationDataOption':
+    def _read_opt_bad(self, schema: 'Schema_AuthorizationDataOption', *,
+                      options: 'Option') -> 'Data_AuthorizationDataOption':
         """Read MH binding authorization data option.
 
         Structure of MH Binding Authorization Data option [:rfc:`6275`]:
@@ -1265,7 +1265,7 @@ class MH(Internet[Data_MH, Schema_MH],
         if schema.length % 8 != 0:
             raise ProtocolError(f'{self.alias}: [Opt {schema.type}] invalid format')
 
-        data = Data_BindingAuthorizationDataOption(
+        data = Data_AuthorizationDataOption(
             type=schema.type,
             length=schema.length + 2,
             data=schema.data,
@@ -1738,7 +1738,7 @@ class MH(Internet[Data_MH, Schema_MH],
                                 extensions: 'Extension') -> 'Data_MultiPrefixExtension':
         """Read multi-prefix CGA extension.
 
-        Structure of Multi-Prefix CGA extension [:rfc:`5535`]::
+        Structure of Multi-Prefix CGA extension [:rfc:`5535`]:
 
         .. code-block:: text
 
@@ -2196,9 +2196,9 @@ class MH(Internet[Data_MH, Schema_MH],
             length=length,
         )
 
-    def _make_opt_bra(self, type: 'Enum_Option', option: 'Optional[Data_BindRefreshAdviceOption]' = None, *,
+    def _make_opt_bra(self, type: 'Enum_Option', option: 'Optional[Data_BindingRefreshAdviceOption]' = None, *,
                       interval: 'int' = 0,
-                      **kwargs: 'Any') -> 'Schema_BindRefreshAdviceOption':
+                      **kwargs: 'Any') -> 'Schema_BindingRefreshAdviceOption':
         """Make MH binding refresh advice option.
 
         Args:
@@ -2214,7 +2214,7 @@ class MH(Internet[Data_MH, Schema_MH],
         if option is not None:
             interval = option.interval
 
-        return Schema_BindRefreshAdviceOption(
+        return Schema_BindingRefreshAdviceOption(
             type=type,
             length=2,
             interval=interval,
@@ -2272,9 +2272,9 @@ class MH(Internet[Data_MH, Schema_MH],
             careof=careof,
         )
 
-    def _make_opt_bad(self, type: 'Enum_Option', option: 'Optional[Data_BindingAuthorizationDataOption]' = None, *,
+    def _make_opt_bad(self, type: 'Enum_Option', option: 'Optional[Data_AuthorizationDataOption]' = None, *,
                       data: 'bytes' = b'',
-                      **kwargs: 'Any') -> 'Schema_BindingAuthorizationDataOption':
+                      **kwargs: 'Any') -> 'Schema_AuthorizationDataOption':
         """Make MH binding authorization data option.
 
         Args:
@@ -2293,7 +2293,7 @@ class MH(Internet[Data_MH, Schema_MH],
         if len(data) % 8 != 0:
             raise ProtocolError(f'{self.alias}: [OptNo {type}] invalid format')
 
-        return Schema_BindingAuthorizationDataOption(
+        return Schema_AuthorizationDataOption(
             type=type,
             length=len(data),
             data=data,

pcapkit/protocols/protocol.py

@@ -528,12 +528,13 @@ class Protocol(Generic[PT, ST], metaclass=abc.ABCMeta):
         self._info = self.unpack(length, **kwargs)
 
     def __init_subclass__(cls, /, schema: 'Optional[Type[ST]]' = None,
-                          data: 'Optional[Type[PT]]' = None, **kwargs: 'Any') -> 'None':
+                          data: 'Optional[Type[PT]]' = None, *args: 'Any', **kwargs: 'Any') -> 'None':
         """Initialisation for subclasses.
 
         Args:
             schema: Schema class.
             data: Data class.
+            *args: Arbitrary positional arguments.
             **kwargs: Arbitrary keyword arguments.
 
         This method is called when a subclass of :class:`Protocol` is defined.
@@ -549,7 +550,7 @@ class Protocol(Generic[PT, ST], metaclass=abc.ABCMeta):
             :class:`~pcapkit.protocols.data.data.Data_Raw` classes will be used.
 
         """
-        super().__init_subclass__(**kwargs)
+        super().__init_subclass__()
 
         if schema is None:
             schema = cast('Type[ST]', getattr(schema_module, cls.__name__, Schema_Raw))

pcapkit/protocols/schema/__init__.py

@@ -75,8 +75,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',
@@ -89,8 +89,8 @@ __all__ = [
     '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_MPTCP',

pcapkit/protocols/schema/application/httpv2.py

@@ -2,6 +2,7 @@
 # mypy: disable-error-code=assignment
 """header schema for HTTP/2 protocol"""
 
+import collections
 import enum
 from typing import TYPE_CHECKING, cast
 
@@ -12,7 +13,7 @@ from pcapkit.corekit.fields.collections import ListField
 from pcapkit.corekit.fields.misc import ConditionalField, SchemaField, SwitchField
 from pcapkit.corekit.fields.numbers import EnumField, NumberField, UInt8Field, UInt32Field
 from pcapkit.corekit.fields.strings import BitField, BytesField, PaddingField
-from pcapkit.protocols.schema.schema import Schema, schema_final
+from pcapkit.protocols.schema.schema import EnumSchema, Schema, schema_final
 from pcapkit.utilities.logging import SPHINX_TYPE_CHECKING
 
 __all__ = [
@@ -78,27 +79,8 @@ def http_frame_selector(pkt: 'dict[str, Any]') -> 'Field':
 
     """
     type = cast('Enum_Frame', pkt['type'])
-    if type == Enum_Frame.DATA:
-        return SchemaField(length=pkt['__length__'], schema=DataFrame)
-    if type == Enum_Frame.HEADERS:
-        return SchemaField(length=pkt['__length__'], schema=HeadersFrame)
-    if type == Enum_Frame.PRIORITY:
-        return SchemaField(length=pkt['__length__'], schema=PriorityFrame)
-    if type == Enum_Frame.RST_STREAM:
-        return SchemaField(length=pkt['__length__'], schema=RSTStreamFrame)
-    if type == Enum_Frame.SETTINGS:
-        return SchemaField(length=pkt['__length__'], schema=SettingsFrame)
-    if type == Enum_Frame.PUSH_PROMISE:
-        return SchemaField(length=pkt['__length__'], schema=PushPromiseFrame)
-    if type == Enum_Frame.PING:
-        return SchemaField(length=pkt['__length__'], schema=PingFrame)
-    if type == Enum_Frame.GOAWAY:
-        return SchemaField(length=pkt['__length__'], schema=GoawayFrame)
-    if type == Enum_Frame.WINDOW_UPDATE:
-        return SchemaField(length=pkt['__length__'], schema=WindowUpdateFrame)
-    if type == Enum_Frame.CONTINUATION:
-        return SchemaField(length=pkt['__length__'], schema=ContinuationFrame)
-    return SchemaField(length=pkt['__length__'], schema=UnassignedFrame)
+    schema = FrameType.registry[type]
+    return SchemaField(length=pkt['__length__'], schema=schema)
 
 
 @schema_final
@@ -133,12 +115,14 @@ class HTTP(Schema):
         def __init__(self, length: 'int', type: 'Enum_Frame', flags: 'FrameFlags', stream: 'StreamID', frame: 'FrameType | bytes') -> 'None': ...
 
 
-class FrameType(Schema):
+class FrameType(EnumSchema[Enum_Frame]):
     """Header schema for HTTP/2 frame payload."""
 
     if TYPE_CHECKING:
         __flags__: 'Flags'
 
+    __enum__ = collections.defaultdict(lambda: UnassignedFrame)
+
     class Flags(enum.IntFlag):
         """Flags enumeration for HTTP/2 frames."""
 
@@ -176,7 +160,7 @@ class UnassignedFrame(FrameType):
 
 
 @schema_final
-class DataFrame(FrameType):
+class DataFrame(FrameType, code=Enum_Frame.DATA):
     """Header schema for HTTP/2 ``DATA`` frames."""
 
     class Flags(FrameType.Flags):
@@ -203,7 +187,7 @@ class DataFrame(FrameType):
 
 
 @schema_final
-class HeadersFrame(FrameType):
+class HeadersFrame(FrameType, code=Enum_Frame.HEADERS):
     """Header schema for HTTP/2 ``HEADERS`` frames."""
 
     class Flags(FrameType.Flags):
@@ -247,7 +231,7 @@ class HeadersFrame(FrameType):
 
 
 @schema_final
-class PriorityFrame(FrameType):
+class PriorityFrame(FrameType, code=Enum_Frame.PRIORITY):
     """Header schema for HTTP/2 ``PRIORITY`` frames."""
 
     #: Stream dependency (exclusive, stream ID).
@@ -263,7 +247,7 @@ class PriorityFrame(FrameType):
 
 
 @schema_final
-class RSTStreamFrame(FrameType):
+class RSTStreamFrame(FrameType, code=Enum_Frame.RST_STREAM):
     """Header schema for HTTP/2 ``RST_STREAM`` frames."""
 
     #: Error code.
@@ -287,7 +271,7 @@ class SettingPair(Schema):
 
 
 @schema_final
-class SettingsFrame(FrameType):
+class SettingsFrame(FrameType, code=Enum_Frame.SETTINGS):
     """Header schema for HTTP/2 ``SETTINGS`` frames."""
 
     class Flags(FrameType.Flags):
@@ -306,7 +290,7 @@ class SettingsFrame(FrameType):
 
 
 @schema_final
-class PushPromiseFrame(FrameType):
+class PushPromiseFrame(FrameType, code=Enum_Frame.PUSH_PROMISE):
     """Header schema for HTTP/2 ``PUSH_PROMISE`` frames."""
 
     class Flags(FrameType.Flags):
@@ -339,7 +323,7 @@ class PushPromiseFrame(FrameType):
 
 
 @schema_final
-class PingFrame(FrameType):
+class PingFrame(FrameType, code=Enum_Frame.PING):
     """Header schema for HTTP/2 ``PING`` frames."""
 
     class Flags(FrameType.Flags):
@@ -355,7 +339,7 @@ class PingFrame(FrameType):
 
 
 @schema_final
-class GoawayFrame(FrameType):
+class GoawayFrame(FrameType, code=Enum_Frame.GOAWAY):
     """Header schema for HTTP/2 ``GOAWAY`` frames."""
 
     #: Last stream ID.
@@ -372,7 +356,7 @@ class GoawayFrame(FrameType):
 
 
 @schema_final
-class WindowUpdateFrame(FrameType):
+class WindowUpdateFrame(FrameType, code=Enum_Frame.WINDOW_UPDATE):
     """Header schema for HTTP/2 ``WINDOW_UPDATE`` frames."""
 
     #: Window size increment.
@@ -385,7 +369,7 @@ class WindowUpdateFrame(FrameType):
 
 
 @schema_final
-class ContinuationFrame(FrameType):
+class ContinuationFrame(FrameType, code=Enum_Frame.CONTINUATION):
     """Header schema for HTTP/2 ``CONTINUATION`` frames."""
 
     class Flags(FrameType.Flags):

pcapkit/protocols/schema/internet/__init__.py

@@ -176,13 +176,13 @@ from pcapkit.protocols.schema.internet.mh import AuthOption as MH_AuthOption
 from pcapkit.protocols.schema.internet.mh import \
     BindingAcknowledgementMessage as MH_BindingAcknowledgementMessage
 from pcapkit.protocols.schema.internet.mh import \
-    BindingAuthorizationDataOption as MH_BindingAuthorizationDataOption
+    AuthorizationDataOption as MH_AuthorizationDataOption
 from pcapkit.protocols.schema.internet.mh import BindingErrorMessage as MH_BindingErrorMessage
 from pcapkit.protocols.schema.internet.mh import \
     BindingRefreshRequestMessage as MH_BindingRefreshRequestMessage
 from pcapkit.protocols.schema.internet.mh import BindingUpdateMessage as MH_BindingUpdateMessage
 from pcapkit.protocols.schema.internet.mh import \
-    BindRefreshAdviceOption as MH_BindRefreshAdviceOption
+    BindingRefreshAdviceOption as MH_BindingRefreshAdviceOption
 from pcapkit.protocols.schema.internet.mh import CareofTestInitMessage as MH_CareofTestInitMessage
 from pcapkit.protocols.schema.internet.mh import CareofTestInitOption as MH_CareofTestInitOption
 from pcapkit.protocols.schema.internet.mh import CareofTestMessage as MH_CareofTestMessage
@@ -283,8 +283,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',