pypcapkit 1.0.0b21__tar.gz → 1.0.0rc1__tar.gz

{pypcapkit-1.0.0b21/pypcapkit.egg-info → pypcapkit-1.0.0rc1}/PKG-INFO

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

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/__init__.py

@@ -113,4 +113,4 @@ __all__ = [
 ]
 
 #: version number
-__version__ = '1.0.0b21'
+__version__ = '1.0.0rc1'

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/all.py

@@ -79,12 +79,14 @@ __all__ = [
 
     # pcapkit.foundation.registry
     'register_protocol',
-    'register_linktype', 'register_pcap',
+    'register_linktype', 'register_pcap', 'register_pcapng',
     'register_ethertype', 'register_transtype',
     'register_port', 'register_tcp_port', 'register_udp_port',
     'register_output',
     'register_extractor_dumper', 'register_extractor_engine',
     'register_traceflow',
+    'register_pcapng_block', 'register_pcapng_option', 'register_pcapng_secrets',
+    'register_pcapng_record',
     'register_hopopt', 'register_ipv6_opts', 'register_ipv6_route',
     'register_ipv4', 'register_hip',
     'register_tcp', 'register_mptcp',
@@ -114,7 +116,8 @@ __all__ = [
 
     # pcapkit.toolkit
     'ipv4_reassembly', 'ipv6_reassembly', 'tcp_reassembly', 'tcp_traceflow',
-                                                            # default engine
+    'pcapng_ipv4_reassembly', 'pcapng_ipv6_reassembly', 'pcapng_tcp_reassembly', 'pcapng_tcp_traceflow',
+    'pcapng_block2frame',                                   # default engine
     'dpkt_ipv6_hdr_len', 'dpkt_packet2chain', 'dpkt_packet2dict',
     'dpkt_ipv4_reassembly', 'dpkt_ipv6_reassembly', 'dpkt_tcp_reassembly', 'dpkt_tcp_traceflow',
                                                             # DPKT engine

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/arp/hardware.py

@@ -159,7 +159,7 @@ class Hardware(IntEnum):
         if isinstance(key, int):
             return Hardware(key)
         if key not in Hardware._member_map_:  # pylint: disable=no-member
-            extend_enum(Hardware, key, default)
+            return extend_enum(Hardware, key, default)
         return Hardware[key]  # type: ignore[misc]
 
     @classmethod
@@ -174,10 +174,8 @@ class Hardware(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 39 <= value <= 255:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 258 <= value <= 65534:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/arp/operation.py

@@ -112,7 +112,7 @@ class Operation(IntEnum):
         if isinstance(key, int):
             return Operation(key)
         if key not in Operation._member_map_:  # pylint: disable=no-member
-            extend_enum(Operation, key, default)
+            return extend_enum(Operation, key, default)
         return Operation[key]  # type: ignore[misc]
 
     @classmethod
@@ -127,6 +127,5 @@ class Operation(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 26 <= value <= 65534:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/ftp/command.py

@@ -23,21 +23,28 @@ __all__ = ['Command']
 class Command(StrEnum):
     """[Command] FTP Command"""
 
+    if TYPE_CHECKING:
+        #: Feature of command.
+        feat: 'Optional[str]'
+        #: Description of command.
+        desc: 'Optional[str]'
+        #: Type of command.
+        type: 'Optional[tuple[str, ...]]'
+        #: Conformance of command.
+        conf: 'Optional[str]'
+        #: Note of command.
+        note: 'Optional[tuple[str, ...]]'
+
     def __new__(cls, name: 'str', feat: 'Optional[str]' = None, desc: 'Optional[str]' = None,
                 type: 'Optional[tuple[str, ...]]' = None, conf: 'Optional[str]' = None,
                 note: 'Optional[tuple[str, ...]]' = None) -> 'Type[Command]':
         obj = str.__new__(cls, name)
         obj._value_ = name
 
-        #: Feature of command.
         obj.feat = feat
-        #: Description of command.
         obj.desc = desc
-        #: Type of command.
         obj.type = type
-        #: Conformance of command.
         obj.conf = conf
-        #: Note of command.
         obj.note = note
 
         return obj
@@ -236,7 +243,7 @@ class Command(StrEnum):
         :meta private:
         """
         if key not in Command._member_map_:  # pylint: disable=no-member
-            extend_enum(Command, key.upper(), default if default is not None else key)
+            return extend_enum(Command, key.upper(), default if default is not None else key)
         return Command[key]  # type: ignore[misc]
 
     @classmethod
@@ -247,5 +254,4 @@ class Command(StrEnum):
             value: Value to get enum item.
 
         """
-        extend_enum(cls, value.upper(), value)
-        return cls(value)
+        return extend_enum(cls, value.upper(), value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/ftp/return_code.py

@@ -43,16 +43,21 @@ INFO = {
 class ReturnCode(IntEnum):
     """[ReturnCode] FTP Server Return Code"""
 
+    if TYPE_CHECKING:
+        #: Description of the return code.
+        description: 'Optional[str]'
+        #: Response kind.
+        kind: 'str'
+        #: Grouping information.
+        group: 'str'
+
     def __new__(cls, value: 'int', description: 'Optional[str]' = None) -> 'Type[ReturnCode]':
         obj = int.__new__(cls, value)
         obj._value_ = value
 
         code = str(value)
-        #: Description of the return code.
         obj.description = description
-        #: Response kind.
         obj.kind = KIND.get(str(value)[0], 'Reserved')
-        #: Grouping information.
         obj.group = INFO.get(str(value)[1], 'Reserved')
 
         return obj
@@ -255,7 +260,7 @@ class ReturnCode(IntEnum):
         if isinstance(key, int):
             return ReturnCode(key)
         if key not in ReturnCode._member_map_:  # pylint: disable=no-member
-            extend_enum(ReturnCode, key, default)
+            return extend_enum(ReturnCode, key, default)
         return ReturnCode[key]  # type: ignore[misc]
 
     @classmethod
@@ -268,5 +273,4 @@ class ReturnCode(IntEnum):
         """
         if not (isinstance(value, int) and 100 <= value <= 659):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
-        extend_enum(cls, 'CODE_%s' % value, value)
-        return cls(value)
+        return extend_enum(cls, 'CODE_%s' % value, value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/certificate.py

@@ -58,7 +58,7 @@ class Certificate(IntEnum):
         if isinstance(key, int):
             return Certificate(key)
         if key not in Certificate._member_map_:  # pylint: disable=no-member
-            extend_enum(Certificate, key, default)
+            return extend_enum(Certificate, key, default)
         return Certificate[key]  # type: ignore[misc]
 
     @classmethod
@@ -73,6 +73,5 @@ class Certificate(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 9 <= value <= 255:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/cipher.py

@@ -46,7 +46,7 @@ class Cipher(IntEnum):
         if isinstance(key, int):
             return Cipher(key)
         if key not in Cipher._member_map_:  # pylint: disable=no-member
-            extend_enum(Cipher, key, default)
+            return extend_enum(Cipher, key, default)
         return Cipher[key]  # type: ignore[misc]
 
     @classmethod
@@ -61,6 +61,5 @@ class Cipher(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 5 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/di.py

@@ -40,7 +40,7 @@ class DITypes(IntEnum):
         if isinstance(key, int):
             return DITypes(key)
         if key not in DITypes._member_map_:  # pylint: disable=no-member
-            extend_enum(DITypes, key, default)
+            return extend_enum(DITypes, key, default)
         return DITypes[key]  # type: ignore[misc]
 
     @classmethod
@@ -55,6 +55,5 @@ class DITypes(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 3 <= value <= 15:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/ecdsa_curve.py

@@ -40,7 +40,7 @@ class ECDSACurve(IntEnum):
         if isinstance(key, int):
             return ECDSACurve(key)
         if key not in ECDSACurve._member_map_:  # pylint: disable=no-member
-            extend_enum(ECDSACurve, key, default)
+            return extend_enum(ECDSACurve, key, default)
         return ECDSACurve[key]  # type: ignore[misc]
 
     @classmethod
@@ -55,6 +55,5 @@ class ECDSACurve(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 3 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/ecdsa_low_curve.py

@@ -37,7 +37,7 @@ class ECDSALowCurve(IntEnum):
         if isinstance(key, int):
             return ECDSALowCurve(key)
         if key not in ECDSALowCurve._member_map_:  # pylint: disable=no-member
-            extend_enum(ECDSALowCurve, key, default)
+            return extend_enum(ECDSALowCurve, key, default)
         return ECDSALowCurve[key]  # type: ignore[misc]
 
     @classmethod
@@ -52,6 +52,5 @@ class ECDSALowCurve(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 2 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/eddsa_curve.py

@@ -46,7 +46,7 @@ class EdDSACurve(IntEnum):
         if isinstance(key, int):
             return EdDSACurve(key)
         if key not in EdDSACurve._member_map_:  # pylint: disable=no-member
-            extend_enum(EdDSACurve, key, default)
+            return extend_enum(EdDSACurve, key, default)
         return EdDSACurve[key]  # type: ignore[misc]
 
     @classmethod
@@ -61,6 +61,5 @@ class EdDSACurve(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 5 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/esp_transform_suite.py

@@ -79,7 +79,7 @@ class ESPTransformSuite(IntEnum):
         if isinstance(key, int):
             return ESPTransformSuite(key)
         if key not in ESPTransformSuite._member_map_:  # pylint: disable=no-member
-            extend_enum(ESPTransformSuite, key, default)
+            return extend_enum(ESPTransformSuite, key, default)
         return ESPTransformSuite[key]  # type: ignore[misc]
 
     @classmethod
@@ -94,6 +94,5 @@ class ESPTransformSuite(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 16 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/group.py

@@ -67,7 +67,7 @@ class Group(IntEnum):
         if isinstance(key, int):
             return Group(key)
         if key not in Group._member_map_:  # pylint: disable=no-member
-            extend_enum(Group, key, default)
+            return extend_enum(Group, key, default)
         return Group[key]  # type: ignore[misc]
 
     @classmethod
@@ -82,6 +82,5 @@ class Group(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 12 <= value <= 255:
             # Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/hi_algorithm.py

@@ -64,7 +64,7 @@ class HIAlgorithm(IntEnum):
         if isinstance(key, int):
             return HIAlgorithm(key)
         if key not in HIAlgorithm._member_map_:  # pylint: disable=no-member
-            extend_enum(HIAlgorithm, key, default)
+            return extend_enum(HIAlgorithm, key, default)
         return HIAlgorithm[key]  # type: ignore[misc]
 
     @classmethod
@@ -79,10 +79,8 @@ class HIAlgorithm(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 10 <= value <= 12:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 14 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/hit_suite.py

@@ -49,7 +49,7 @@ class HITSuite(IntEnum):
         if isinstance(key, int):
             return HITSuite(key)
         if key not in HITSuite._member_map_:  # pylint: disable=no-member
-            extend_enum(HITSuite, key, default)
+            return extend_enum(HITSuite, key, default)
         return HITSuite[key]  # type: ignore[misc]
 
     @classmethod
@@ -64,6 +64,5 @@ class HITSuite(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 6 <= value <= 15:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/nat_traversal.py

@@ -43,7 +43,7 @@ class NATTraversal(IntEnum):
         if isinstance(key, int):
             return NATTraversal(key)
         if key not in NATTraversal._member_map_:  # pylint: disable=no-member
-            extend_enum(NATTraversal, key, default)
+            return extend_enum(NATTraversal, key, default)
         return NATTraversal[key]  # type: ignore[misc]
 
     @classmethod
@@ -58,6 +58,5 @@ class NATTraversal(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 4 <= value <= 65535:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/notify_message.py

@@ -145,7 +145,7 @@ class NotifyMessage(IntEnum):
         if isinstance(key, int):
             return NotifyMessage(key)
         if key not in NotifyMessage._member_map_:  # pylint: disable=no-member
-            extend_enum(NotifyMessage, key, default)
+            return extend_enum(NotifyMessage, key, default)
         return NotifyMessage[key]  # type: ignore[misc]
 
     @classmethod
@@ -160,54 +160,41 @@ class NotifyMessage(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 2 <= value <= 6:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 8 <= value <= 13:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 21 <= value <= 23:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 29 <= value <= 31:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 33 <= value <= 39:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 52 <= value <= 59:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 65 <= value <= 69:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 71 <= value <= 89:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 91 <= value <= 99:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 101 <= value <= 8191:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 8192 <= value <= 16383:
             #: Reserved for Private Use [:rfc:`7401`]
-            extend_enum(cls, 'Reserved_for_Private_Use_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Reserved_for_Private_Use_%d' % value, value)
         if 16386 <= value <= 40959:
             #: Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 40960 <= value <= 65535:
             #: Reserved for Private Use [:rfc:`7401`]
-            extend_enum(cls, 'Reserved_for_Private_Use_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Reserved_for_Private_Use_%d' % value, value)
         return super()._missing_(value)

{pypcapkit-1.0.0b21 → pypcapkit-1.0.0rc1}/pcapkit/const/hip/packet.py

@@ -64,7 +64,7 @@ class Packet(IntEnum):
         if isinstance(key, int):
             return Packet(key)
         if key not in Packet._member_map_:  # pylint: disable=no-member
-            extend_enum(Packet, key, default)
+            return extend_enum(Packet, key, default)
         return Packet[key]  # type: ignore[misc]
 
     @classmethod
@@ -79,14 +79,11 @@ class Packet(IntEnum):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
         if 5 <= value <= 15:
             # Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 21 <= value <= 31:
             # Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         if 33 <= value <= 127:
             # Unassigned
-            extend_enum(cls, 'Unassigned_%d' % value, value)
-            return cls(value)
+            return extend_enum(cls, 'Unassigned_%d' % value, value)
         return super()._missing_(value)