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

pcapkit/protocols/schema/transport/tcp.py

@@ -17,7 +17,7 @@ from pcapkit.corekit.fields.misc import (ConditionalField, ForwardMatchField, Pa
 from pcapkit.corekit.fields.numbers import (EnumField, NumberField, UInt8Field, UInt16Field,
                                             UInt32Field, UInt64Field)
 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.exceptions import FieldError
 from pcapkit.utilities.logging import SPHINX_TYPE_CHECKING
 
@@ -26,8 +26,8 @@ __all__ = [
 
     'Option',
     'UnassignedOption', 'EndOfOptionList', 'NoOperation', 'MaximumSegmentSize', 'WindowScale',
-    'SACKPermitted', 'SACK', 'Echo', 'EchoReply', 'Timestamp', 'PartialOrderConnectionPermitted',
-    'PartialOrderConnectionProfile', 'CC', 'CCNew', 'CCEcho', 'AlternateChecksumRequest',
+    'SACKPermitted', 'SACK', 'Echo', 'EchoReply', 'Timestamps', 'PartialOrderConnectionPermitted',
+    'PartialOrderServiceProfile', 'CC', 'CCNew', 'CCEcho', 'AlternateChecksumRequest',
     'AlternateChecksumData', 'MD5Signature', 'QuickStartResponse', 'UserTimeout',
     'Authentication', 'FastOpenCookie',
 
@@ -41,7 +41,7 @@ __all__ = [
 
 if TYPE_CHECKING:
     from ipaddress import IPv4Address, IPv6Address
-    from typing import Any, Optional
+    from typing import Any, DefaultDict, Optional, Type
 
     from pcapkit.corekit.fields.field import _Field as Field
     from pcapkit.protocols.protocol import Protocol
@@ -199,30 +199,18 @@ def mptcp_data_selector(pkt: 'dict[str, Any]') -> 'Field':
     """
     subtype = Enum_MPTCPOption.get(pkt['test']['subtype'])
     pkt['test']['subtype'] = subtype
+    schema = MPTCP.registry[subtype]
 
-    if subtype == Enum_MPTCPOption.MP_CAPABLE:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPCapable)
-    if subtype == Enum_MPTCPOption.MP_JOIN:
+    if subtype == Enum_MPTCPOption.MP_JOIN and schema is MPTCPJoin:  # placeholder
         if pkt['flags']['syn'] == 1 and pkt['flags']['ack'] == 0:
-            return SchemaField(length=pkt['test']['length'], schema=MPTCPJoinSYN)
-        if pkt['flags']['syn'] == 1 and pkt['flags']['ack'] == 1:
-            return SchemaField(length=pkt['test']['length'], schema=MPTCPJoinSYNACK)
-        if pkt['flags']['syn'] == 0 and pkt['flags']['ack'] == 1:
-            return SchemaField(length=pkt['test']['length'], schema=MPTCPJoinACK)
-        raise FieldError(f'TCP: [OptNo {Enum_Option.Multipath_TCP}] {Enum_MPTCPOption.MP_JOIN} invalid flags')
-    if subtype == Enum_MPTCPOption.DSS:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPDSS)
-    if subtype == Enum_MPTCPOption.ADD_ADDR:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPAddAddress)
-    if subtype == Enum_MPTCPOption.REMOVE_ADDR:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPRemoveAddress)
-    if subtype == Enum_MPTCPOption.MP_PRIO:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPPriority)
-    if subtype == Enum_MPTCPOption.MP_FAIL:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPFallback)
-    if subtype == Enum_MPTCPOption.MP_FASTCLOSE:
-        return SchemaField(length=pkt['test']['length'], schema=MPTCPFastclose)
-    return SchemaField(length=pkt['test']['length'], schema=MPTCPUnknown)
+            schema = MPTCPJoinSYN
+        elif pkt['flags']['syn'] == 1 and pkt['flags']['ack'] == 1:
+            schema = MPTCPJoinSYNACK
+        elif pkt['flags']['syn'] == 0 and pkt['flags']['ack'] == 1:
+            schema = MPTCPJoinACK
+        else:
+            raise FieldError(f'TCP: [OptNo {Enum_Option.Multipath_TCP}] {Enum_MPTCPOption.MP_JOIN} invalid flags')
+    return SchemaField(length=pkt['test']['length'], schema=schema)
 
 
 def mptcp_add_address_selector(pkt: 'dict[str, Any]') -> 'Field':
@@ -296,9 +284,11 @@ class PortEnumField(EnumField):
         return self._namespace.get(value, proto=Enum_TransportProtocol.tcp)
 
 
-class Option(Schema):
+class Option(EnumSchema[Enum_Option]):
     """Header schema for TCP options."""
 
+    __default__ = lambda: UnassignedOption
+
     #: Option kind.
     kind: 'Enum_Option' = EnumField(length=1, namespace=Enum_Option)
     #: Option length.
@@ -335,7 +325,7 @@ class UnassignedOption(Option):
 
 
 @schema_final
-class EndOfOptionList(Option):
+class EndOfOptionList(Option, code=Enum_Option.End_of_Option_List):
     """Header schema for TCP end of option list."""
 
     if TYPE_CHECKING:
@@ -343,7 +333,7 @@ class EndOfOptionList(Option):
 
 
 @schema_final
-class NoOperation(Option):
+class NoOperation(Option, code=Enum_Option.No_Operation):
     """Header schema for TCP no operation."""
 
     if TYPE_CHECKING:
@@ -351,7 +341,7 @@ class NoOperation(Option):
 
 
 @schema_final
-class MaximumSegmentSize(Option):
+class MaximumSegmentSize(Option, code=Enum_Option.Maximum_Segment_Size):
     """Header schema for TCP max segment size option."""
 
     #: Maximum segment size.
@@ -362,7 +352,7 @@ class MaximumSegmentSize(Option):
 
 
 @schema_final
-class WindowScale(Option):
+class WindowScale(Option, code=Enum_Option.Window_Scale):
     """Header schema for TCP window scale option."""
 
     #: Window scale (shift count).
@@ -373,7 +363,7 @@ class WindowScale(Option):
 
 
 @schema_final
-class SACKPermitted(Option):
+class SACKPermitted(Option, code=Enum_Option.SACK_Permitted):
     """Header schema for TCP SACK permitted option."""
 
     if TYPE_CHECKING:
@@ -394,7 +384,7 @@ class SACKBlock(Schema):
 
 
 @schema_final
-class SACK(Option):
+class SACK(Option, code=Enum_Option.SACK):
     """Header schema for TCP SACK option."""
 
     #: Selected ACK data.
@@ -408,7 +398,7 @@ class SACK(Option):
 
 
 @schema_final
-class Echo(Option):
+class Echo(Option, code=Enum_Option.Echo):
     """Header schema for TCP echo option."""
 
     #: Info to be echoed.
@@ -419,7 +409,7 @@ class Echo(Option):
 
 
 @schema_final
-class EchoReply(Option):
+class EchoReply(Option, code=Enum_Option.Echo_Reply):
     """Header schema for TCP echo reply option."""
 
     #: Echoed info.
@@ -430,7 +420,7 @@ class EchoReply(Option):
 
 
 @schema_final
-class Timestamp(Option):
+class Timestamps(Option, code=Enum_Option.Timestamps):
     """Header schema for TCP timestamps option."""
 
     #: Timestamp value.
@@ -443,7 +433,7 @@ class Timestamp(Option):
 
 
 @schema_final
-class PartialOrderConnectionPermitted(Option):
+class PartialOrderConnectionPermitted(Option, code=Enum_Option.Partial_Order_Connection_Permitted):
     """Header schema for TCP partial order connection permitted option."""
 
     if TYPE_CHECKING:
@@ -451,7 +441,7 @@ class PartialOrderConnectionPermitted(Option):
 
 
 @schema_final
-class PartialOrderConnectionProfile(Option):
+class PartialOrderServiceProfile(Option, code=Enum_Option.Partial_Order_Service_Profile):
     """Header schema for TCP partial order connection service profile option."""
 
     #: Profile data.
@@ -465,7 +455,7 @@ class PartialOrderConnectionProfile(Option):
 
 
 @schema_final
-class CC(Option):
+class CC(Option, code=Enum_Option.CC):
     """Header schema for TCP CC option."""
 
     #: Connection count.
@@ -476,7 +466,7 @@ class CC(Option):
 
 
 @schema_final
-class CCNew(Option):
+class CCNew(Option, code=Enum_Option.CC_NEW):
     """Header schema for TCP connection count (new) option."""
 
     #: Connection count.
@@ -487,7 +477,7 @@ class CCNew(Option):
 
 
 @schema_final
-class CCEcho(Option):
+class CCEcho(Option, code=Enum_Option.CC_ECHO):
     """Header schema for TCP connection count (echo) option."""
 
     #: Connection count.
@@ -498,7 +488,7 @@ class CCEcho(Option):
 
 
 @schema_final
-class AlternateChecksumRequest(Option):
+class AlternateChecksumRequest(Option, code=Enum_Option.TCP_Alternate_Checksum_Request):
     """Header schema for TCP alternate checksum request option."""
 
     #: Checksum algorithm.
@@ -509,7 +499,7 @@ class AlternateChecksumRequest(Option):
 
 
 @schema_final
-class AlternateChecksumData(Option):
+class AlternateChecksumData(Option, code=Enum_Option.TCP_Alternate_Checksum_Data):
     """Header schema for TCP alternate checksum data option."""
 
     #: Checksum data.
@@ -520,7 +510,7 @@ class AlternateChecksumData(Option):
 
 
 @schema_final
-class MD5Signature(Option):
+class MD5Signature(Option, code=Enum_Option.MD5_Signature_Option):
     """Header schema for TCP MD5 signature option."""
 
     #: MD5 digest.
@@ -531,7 +521,7 @@ class MD5Signature(Option):
 
 
 @schema_final
-class QuickStartResponse(Option):
+class QuickStartResponse(Option, code=Enum_Option.Quick_Start_Response):
     """Header schema for TCP quick start response option."""
 
     #: Flags.
@@ -550,7 +540,7 @@ class QuickStartResponse(Option):
 
 
 @schema_final
-class UserTimeout(Option):
+class UserTimeout(Option, code=Enum_Option.User_Timeout_Option):
     """Header schema for TCP user timeout option."""
 
     #: Granularity and user timeout.
@@ -564,7 +554,7 @@ class UserTimeout(Option):
 
 
 @schema_final
-class Authentication(Option):
+class Authentication(Option, code=Enum_Option.TCP_Authentication_Option):
     """Header schema for TCP authentication option."""
 
     #: Key ID.
@@ -607,9 +597,15 @@ class _MPTCP(Schema):
         return ret
 
 
-class MPTCP(Option):
+# register ``_MPTCP`` as ``Multipath_TCP`` option
+Option.register(Enum_Option.Multipath_TCP, _MPTCP)
+
+
+class MPTCP(EnumSchema[Enum_MPTCPOption]):
     """Header schema for Multipath TCP options."""
 
+    __enum__: 'DefaultDict[Enum_MPTCPOption, Type[MPTCP]]' = collections.defaultdict(lambda: MPTCPUnknown)
+
     if TYPE_CHECKING:
         #: MPTCP subtype.
         subtype: 'Enum_MPTCPOption'
@@ -632,7 +628,7 @@ class MPTCPUnknown(MPTCP):
 
 
 @schema_final
-class MPTCPCapable(MPTCP):
+class MPTCPCapable(MPTCP, code=Enum_MPTCPOption.MP_CAPABLE):
     """Header schema for Multipath TCP capable option."""
 
     #: Subtype and version.
@@ -658,7 +654,7 @@ class MPTCPCapable(MPTCP):
         def __init__(self, kind: 'Enum_Option', length: 'int', test: 'MPTCPSubtypeCapable', flags: 'MPTCPCapableFlags', skey: 'int', rkey: 'Optional[int]') -> 'None': ...
 
 
-class MPTCPJoin(MPTCP):
+class MPTCPJoin(MPTCP, code=Enum_MPTCPOption.MP_JOIN):  # register as a placeholder
     """Header schema for Multipath TCP join option."""
 
 
@@ -720,7 +716,7 @@ class MPTCPJoinACK(MPTCPJoin):
 
 
 @schema_final
-class MPTCPDSS(MPTCP):
+class MPTCPDSS(MPTCP, code=Enum_MPTCPOption.DSS):
     """Header schema for Multipath TCP DSS option."""
 
     #: Subtype and flags.
@@ -766,7 +762,7 @@ class MPTCPDSS(MPTCP):
 
 
 @schema_final
-class MPTCPAddAddress(MPTCP):
+class MPTCPAddAddress(MPTCP, code=Enum_MPTCPOption.ADD_ADDR):
     """Header schema for Multipath TCP add address option."""
 
     #: Subtype and IP version.
@@ -791,7 +787,7 @@ class MPTCPAddAddress(MPTCP):
 
 
 @schema_final
-class MPTCPRemoveAddress(MPTCP):
+class MPTCPRemoveAddress(MPTCP, code=Enum_MPTCPOption.REMOVE_ADDR):
     """Header schema for Multipath TCP remove address option."""
 
     #: Subtype.
@@ -809,7 +805,7 @@ class MPTCPRemoveAddress(MPTCP):
 
 
 @schema_final
-class MPTCPPriority(MPTCP):
+class MPTCPPriority(MPTCP, code=Enum_MPTCPOption.MP_PRIO):
     """Header schema for Multipath TCP priority option."""
 
     #: Subtype.
@@ -828,7 +824,7 @@ class MPTCPPriority(MPTCP):
 
 
 @schema_final
-class MPTCPFallback(MPTCP):
+class MPTCPFallback(MPTCP, code=Enum_MPTCPOption.MP_FAIL):
     """Header schema for Multipath TCP fallback option."""
 
     #: Subtype.
@@ -843,7 +839,7 @@ class MPTCPFallback(MPTCP):
 
 
 @schema_final
-class MPTCPFastclose(MPTCP):
+class MPTCPFastclose(MPTCP, code=Enum_MPTCPOption.MP_FASTCLOSE):
     """Header schema for Multipath TCP fastclose option."""
 
     #: Subtype.
@@ -858,7 +854,7 @@ class MPTCPFastclose(MPTCP):
 
 
 @schema_final
-class FastOpenCookie(Option):
+class FastOpenCookie(Option, code=Enum_Option.TCP_Fast_Open_Cookie):
     """"Header schema for TCP Fast Open option."""
 
     #: Cookie.
@@ -910,31 +906,8 @@ class TCP(Schema):
         length=lambda pkt: pkt['offset']['offset'] * 4 - 20,
         base_schema=Option,
         type_name='kind',
+        registry=Option.registry,
         eool=Enum_Option.End_of_Option_List,
-        registry=collections.defaultdict(lambda: UnassignedOption, {
-            Enum_Option.End_of_Option_List: EndOfOptionList,
-            Enum_Option.No_Operation: NoOperation,
-            Enum_Option.Maximum_Segment_Size: MaximumSegmentSize,
-            Enum_Option.Window_Scale: WindowScale,
-            Enum_Option.SACK_Permitted: SACKPermitted,
-            Enum_Option.SACK: SACK,
-            Enum_Option.Echo: Echo,
-            Enum_Option.Echo_Reply: EchoReply,
-            Enum_Option.Timestamps: Timestamp,
-            Enum_Option.Partial_Order_Connection_Permitted: PartialOrderConnectionPermitted,
-            Enum_Option.Partial_Order_Service_Profile: PartialOrderConnectionProfile,
-            Enum_Option.CC: CC,
-            Enum_Option.CC_NEW: CCNew,
-            Enum_Option.CC_ECHO: CCEcho,
-            Enum_Option.TCP_Alternate_Checksum_Request: AlternateChecksumRequest,
-            Enum_Option.TCP_Alternate_Checksum_Data: AlternateChecksumData,
-            Enum_Option.MD5_Signature_Option: MD5Signature,
-            Enum_Option.Quick_Start_Response: QuickStartResponse,
-            Enum_Option.User_Timeout_Option: UserTimeout,
-            Enum_Option.TCP_Authentication_Option: Authentication,
-            Enum_Option.Multipath_TCP: _MPTCP,
-            Enum_Option.TCP_Fast_Open_Cookie: FastOpenCookie,
-        }),
     )
     #: Padding.
     padding: 'bytes' = PaddingField(length=lambda pkt: pkt.get('__option_padding__', 0))  # key generated by OptionField

pcapkit/protocols/transport/tcp.py

@@ -82,11 +82,11 @@ from pcapkit.protocols.data.transport.tcp import NoOperation as Data_NoOperation
 from pcapkit.protocols.data.transport.tcp import \
     PartialOrderConnectionPermitted as Data_PartialOrderConnectionPermitted
 from pcapkit.protocols.data.transport.tcp import \
-    PartialOrderConnectionProfile as Data_PartialOrderConnectionProfile
+    PartialOrderServiceProfile as Data_PartialOrderServiceProfile
 from pcapkit.protocols.data.transport.tcp import QuickStartResponse as Data_QuickStartResponse
 from pcapkit.protocols.data.transport.tcp import SACKBlock as Data_SACKBlock
 from pcapkit.protocols.data.transport.tcp import SACKPermitted as Data_SACKPermitted
-from pcapkit.protocols.data.transport.tcp import Timestamp as Data_Timestamp
+from pcapkit.protocols.data.transport.tcp import Timestamps as Data_Timestamps
 from pcapkit.protocols.data.transport.tcp import UnassignedOption as Data_UnassignedOption
 from pcapkit.protocols.data.transport.tcp import UserTimeout as Data_UserTimeout
 from pcapkit.protocols.data.transport.tcp import WindowScale as Data_WindowScale
@@ -121,11 +121,11 @@ from pcapkit.protocols.schema.transport.tcp import NoOperation as Schema_NoOpera
 from pcapkit.protocols.schema.transport.tcp import \
     PartialOrderConnectionPermitted as Schema_PartialOrderConnectionPermitted
 from pcapkit.protocols.schema.transport.tcp import \
-    PartialOrderConnectionProfile as Schema_PartialOrderConnectionProfile
+    PartialOrderServiceProfile as Schema_PartialOrderServiceProfile
 from pcapkit.protocols.schema.transport.tcp import QuickStartResponse as Schema_QuickStartResponse
 from pcapkit.protocols.schema.transport.tcp import SACKBlock as Schema_SACKBlock
 from pcapkit.protocols.schema.transport.tcp import SACKPermitted as Schema_SACKPermitted
-from pcapkit.protocols.schema.transport.tcp import Timestamp as Schema_Timestamp
+from pcapkit.protocols.schema.transport.tcp import Timestamps as Schema_Timestamps
 from pcapkit.protocols.schema.transport.tcp import UnassignedOption as Schema_UnassignedOption
 from pcapkit.protocols.schema.transport.tcp import UserTimeout as Schema_UserTimeout
 from pcapkit.protocols.schema.transport.tcp import WindowScale as Schema_WindowScale
@@ -960,7 +960,7 @@ class TCP(Transport[Data_TCP, Schema_TCP],
         )
         return data
 
-    def _read_mode_ts(self, schema: 'Schema_Timestamp', *, options: 'Option') -> 'Data_Timestamp':  # pylint: disable=unused-argument
+    def _read_mode_ts(self, schema: 'Schema_Timestamps', *, options: 'Option') -> 'Data_Timestamps':  # pylint: disable=unused-argument
         """Read TCP timestamps option.
 
         Structure of TCP timestamp option [:rfc:`7323`]:
@@ -986,7 +986,7 @@ class TCP(Transport[Data_TCP, Schema_TCP],
         if schema.length != 10:
             raise ProtocolError(f'{self.alias}: [OptNo {schema.kind}] invalid format')
 
-        data = Data_Timestamp(
+        data = Data_Timestamps(
             kind=schema.kind,
             length=schema.length,
             timestamp=schema.value,
@@ -1024,7 +1024,7 @@ class TCP(Transport[Data_TCP, Schema_TCP],
             length=schema.length,
         )
 
-    def _read_mode_pocsp(self, schema: 'Schema_PartialOrderConnectionProfile', *, options: 'Option') -> 'Data_PartialOrderConnectionProfile':  # pylint: disable=unused-argument
+    def _read_mode_pocsp(self, schema: 'Schema_PartialOrderServiceProfile', *, options: 'Option') -> 'Data_PartialOrderServiceProfile':  # pylint: disable=unused-argument
         """Read TCP partial order connection service profile option.
 
         Structure of TCP ``POC-SP`` option [:rfc:`1693`][:rfc:`6247`]:
@@ -1050,7 +1050,7 @@ class TCP(Transport[Data_TCP, Schema_TCP],
         if schema.length != 3:
             raise ProtocolError(f'{self.alias}: [OptNo {schema.kind}] invalid format')
 
-        data = Data_PartialOrderConnectionProfile(
+        data = Data_PartialOrderServiceProfile(
             kind=schema.kind,
             length=schema.length,
             start=bool(schema.profile['start']),
@@ -2206,10 +2206,10 @@ class TCP(Transport[Data_TCP, Schema_TCP],
             data=data,
         )
 
-    def _make_mode_ts(self, code: 'Enum_Option', opt: 'Optional[Data_Timestamp]' = None, *,
+    def _make_mode_ts(self, code: 'Enum_Option', opt: 'Optional[Data_Timestamps]' = None, *,
                       tsval: 'int' = 0,
                       tsecr: 'int' = 0,
-                      **kwargs: 'Any') -> 'Schema_Timestamp':
+                      **kwargs: 'Any') -> 'Schema_Timestamps':
         """Make TCP timestamps option.
 
         Args:
@@ -2227,7 +2227,7 @@ class TCP(Transport[Data_TCP, Schema_TCP],
             tsval = opt.timestamp
             tsecr = opt.echo
 
-        return Schema_Timestamp(
+        return Schema_Timestamps(
             kind=code,
             length=10,
             value=tsval,
@@ -2252,10 +2252,10 @@ class TCP(Transport[Data_TCP, Schema_TCP],
             length=2,
         )
 
-    def _make_mode_pocsp(self, code: 'Enum_Option', opt: 'Optional[Data_PartialOrderConnectionProfile]' = None, *,
+    def _make_mode_pocsp(self, code: 'Enum_Option', opt: 'Optional[Data_PartialOrderServiceProfile]' = None, *,
                          start: 'bool' = False,
                          end: 'bool' = False,
-                         **kwargs: 'Any') -> 'Schema_PartialOrderConnectionProfile':
+                         **kwargs: 'Any') -> 'Schema_PartialOrderServiceProfile':
         """Make TCP partial order connection service profile option.
 
         Args:
@@ -2273,7 +2273,7 @@ class TCP(Transport[Data_TCP, Schema_TCP],
             start = opt.start
             end = opt.end
 
-        return Schema_PartialOrderConnectionProfile(
+        return Schema_PartialOrderServiceProfile(
             kind=code,
             length=3,
             profile={

pcapkit/vendor/pcapng/option_type.py

@@ -46,7 +46,7 @@ from aenum import StrEnum, extend_enum
 __all__ = ['{NAME}']
 
 if TYPE_CHECKING:
-    from typing import DefaultDict, Optional, Type
+    from typing import Any, DefaultDict, Optional, Type
 
 
 class {NAME}(StrEnum):
@@ -62,7 +62,7 @@ class {NAME}(StrEnum):
     __members_ns__: 'DefaultDict[str, dict[int, {NAME}]]' = defaultdict(dict)
 
     def __new__(cls, value: 'int', name: 'str' = 'opt_unknown') -> 'Type[{NAME}]':
-        temp = '%d_%s' % (value, name)
+        temp = '%s [%d]' % (name, value)
 
         obj = str.__new__(cls, temp)
         obj._value_ = temp
@@ -78,6 +78,33 @@ class {NAME}(StrEnum):
     def __repr__(self) -> 'str':
         return "<%s.%s: %d>" % (self.__class__.__name__, self.opt_name, self.opt_value)
 
+    def __str__(self) -> 'str':
+        return '%s [%d]' % (self.opt_name, self.opt_value)
+
+    def __int__(self) -> 'int':
+        return self.opt_value
+
+    def __lt__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value < other
+
+    def __gt__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value > other
+
+    def __le__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value <= other
+
+    def __ge__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value >= other
+
+    def __eq__(self, other: 'Any') -> 'bool':
+        return self.opt_value == other
+
+    def __ne__(self, other: 'Any') -> 'bool':
+        return self.opt_value != other
+
+    def __hash__(self) -> 'int':
+        return hash(self.opt_value)
+
     {ENUM}
 
     @staticmethod

pcapkit/vendor/reg/apptype.py

@@ -47,7 +47,7 @@ from pcapkit.utilities.compat import show_flag_values
 __all__ = ['{NAME}']
 
 if TYPE_CHECKING:
-    from typing import DefaultDict, Type
+    from typing import Any, DefaultDict, Type
 
 
 class TransportProtocol(IntFlag):
@@ -97,7 +97,7 @@ class {NAME}(StrEnum):
 
     def __new__(cls, value: 'int', name: 'str' = '<null>',
                 proto: 'TransportProtocol' = TransportProtocol.undefined) -> 'Type[{NAME}]':
-        temp = '%s_%d_%s' % (proto.name, value, name)
+        temp = '%s [%d - %s]' % (name, value, proto.name)
 
         obj = str.__new__(cls, temp)
         obj._value_ = temp
@@ -116,6 +116,33 @@ class {NAME}(StrEnum):
     def __repr__(self) -> 'str':
         return "<%s.%s: %d [%s]>" % (self.__class__.__name__, self.svc, self.port, self.proto.name)
 
+    def __str__(self) -> 'str':
+        return '%s [%d - %s]' % (self.svc, self.port, self.proto.name)
+
+    def __int__(self) -> 'int':
+        return self.opt_value
+
+    def __lt__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value < other
+
+    def __gt__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value > other
+
+    def __le__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value <= other
+
+    def __ge__(self, other: '{NAME}') -> 'bool':
+        return self.opt_value >= other
+
+    def __eq__(self, other: 'Any') -> 'bool':
+        return self.opt_value == other
+
+    def __ne__(self, other: 'Any') -> 'bool':
+        return self.opt_value != other
+
+    def __hash__(self) -> 'int':
+        return hash(self.opt_value)
+
     {ENUM}
 
     @staticmethod
@@ -226,7 +253,10 @@ class AppType(Vendor):
                 if renm in line:
                     if port == line[renm][1]:
                         line[renm][2] = f'{line[renm][2]} | {proto}'
-                        line[renm][3] = f'{line[renm][3]}\n    #: {cmmt}'
+                        if line[renm][3].startswith('-'):
+                            line[renm][3] = f'{line[renm][3]}\n    #: - {cmmt}'
+                        else:
+                            line[renm][3] = f'- {line[renm][3]}\n    #: - {cmmt}'
                     else:
                         line[f'{renm}_{line[renm][1]}'] = line[renm]
                         line[f'{renm}_{code}'] = [svc, port, proto, cmmt]
@@ -254,7 +284,7 @@ class AppType(Vendor):
             if keyword.iskeyword(key):
                 key = '%s_' % key
 
-            pres = f'{key} = {code}, {svc!r}, {proto}'
+            pres = f"{key}: 'AppType' = {code}, {svc!r}, {proto}"
             sufs = f'#: {cmmt}'
 
             enum.append(f'{sufs}\n    {pres}')

{pypcapkit-1.0.3.dist-info → pypcapkit-1.1.0.dist-info}/METADATA

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