Skip to content

fix(hip): resolve a str enum name in list-argument makers too #2401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JarryShaw merged 1 commit into from
Oct 27, 2026
Merged

fix(hip): resolve a str enum name in list-argument makers too #2401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 92 additions & 5 deletions pcapkit/protocols/internet/hip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,18 @@
from pcapkit.const.hip.ecdsa_curve import ECDSACurve as Enum_ECDSACurve
from pcapkit.const.hip.ecdsa_low_curve import ECDSALowCurve as Enum_ECDSALowCurve
from pcapkit.const.hip.eddsa_curve import EdDSACurve as Enum_EdDSACurve
from pcapkit.const.hip.esp_transform_suite import ESPTransformSuite as Enum_ESPTransformSuite
from pcapkit.const.hip.group import Group as Enum_Group
from pcapkit.const.hip.hi_algorithm import HIAlgorithm as Enum_HIAlgorithm
from pcapkit.const.hip.hit_suite import HITSuite as Enum_HITSuite
from pcapkit.const.hip.nat_traversal import NATTraversal as Enum_NATTraversal
from pcapkit.const.hip.notify_message import NotifyMessage as Enum_NotifyMessage
from pcapkit.const.hip.packet import Packet as Enum_Packet
from pcapkit.const.hip.parameter import Parameter as Enum_Parameter
from pcapkit.const.hip.registration import Registration as Enum_Registration
from pcapkit.const.hip.registration_failure import RegistrationFailure as Enum_RegistrationFailure
from pcapkit.const.hip.suite import Suite as Enum_Suite
from pcapkit.const.hip.transport import Transport as Enum_Transport
from pcapkit.const.reg.transtype import TransType as Enum_TransType
from pcapkit.corekit.fields.ipaddress import parse_ip_address
from pcapkit.corekit.multidict import OrderedMultiDict
Expand Down Expand Up @@ -216,11 +221,6 @@
from mypy_extensions import DefaultArg, KwArg, NamedArg
from typing_extensions import Literal, NotRequired

from pcapkit.const.hip.esp_transform_suite import ESPTransformSuite as Enum_ESPTransformSuite
from pcapkit.const.hip.nat_traversal import NATTraversal as Enum_NATTraversal
from pcapkit.const.hip.registration import Registration as Enum_Registration
from pcapkit.const.hip.suite import Suite as Enum_Suite
from pcapkit.const.hip.transport import Transport as Enum_Transport
from pcapkit.corekit.protochain import ProtoChain
from pcapkit.protocols.protocol import ProtocolBase
from pcapkit.protocols.schema.internet.hip import Parameter as Schema_Parameter
Expand Down Expand Up @@ -3745,6 +3745,13 @@ def _make_param_dh_group_list(self, code: 'Enum_Parameter', param: 'Optional[Dat
if groups is None:
groups = []

# NOTE: ``group`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if group_namespace is None:
group_namespace = Enum_Group

group_id = []
for group in groups:
group_id.append(self._make_index(group, group_default, namespace=group_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -3827,6 +3834,13 @@ def _make_param_hip_transform(self, code: 'Enum_Parameter', param: 'Optional[Dat
if suites is None:
suites = []

# NOTE: ``suite`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if suite_namespace is None:
suite_namespace = Enum_Suite

suite_id = []
for suite in suites:
suite_id.append(self._make_index(suite, suite_default, namespace=suite_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -3873,6 +3887,13 @@ def _make_param_hip_cipher(self, code: 'Enum_Parameter', param: 'Optional[Data_H
if ciphers is None:
ciphers = []

# NOTE: ``cipher`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if cipher_namespace is None:
cipher_namespace = Enum_Cipher

cipher_id = []
for cipher in ciphers:
cipher_id.append(self._make_index(cipher, cipher_default, namespace=cipher_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -3917,6 +3938,13 @@ def _make_param_nat_traversal_mode(self, code: 'Enum_Parameter', param: 'Optiona
if modes is None:
modes = []

# NOTE: ``mode`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if mode_namespace is None:
mode_namespace = Enum_NATTraversal

mode_id = []
for mode in modes:
mode_id.append(self._make_index(mode, mode_default, namespace=mode_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4184,6 +4212,13 @@ def _make_param_hit_suite_list(self, code: 'Enum_Parameter', param: 'Optional[Da
if suites is None:
suites = []

# NOTE: ``suite`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if suite_namespace is None:
suite_namespace = Enum_HITSuite

suite_id = []
for suite in suites:
suite_id.append(self._make_index(suite, suite_default, namespace=suite_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4361,6 +4396,13 @@ def _make_param_reg_info(self, code: 'Enum_Parameter', param: 'Optional[Data_Reg
if reg_info is None:
reg_info = []

# NOTE: ``reg`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if reg_info_namespace is None:
reg_info_namespace = Enum_Registration

reg_type = []
for reg in reg_info:
reg_type.append(self._make_index(reg, reg_info_default, namespace=reg_info_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4409,6 +4451,13 @@ def _make_param_reg_request(self, code: 'Enum_Parameter', param: 'Optional[Data_
if reg_request is None:
reg_request = []

# NOTE: ``reg`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if reg_request_namespace is None:
reg_request_namespace = Enum_Registration

reg_type = []
for reg in reg_request:
reg_type.append(self._make_index(reg, reg_request_default, namespace=reg_request_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4455,6 +4504,13 @@ def _make_param_reg_response(self, code: 'Enum_Parameter', param: 'Optional[Data
if reg_response is None:
reg_response = []

# NOTE: ``reg`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if reg_response_namespace is None:
reg_response_namespace = Enum_Registration

reg_type = []
for reg in reg_response:
reg_type.append(self._make_index(reg, reg_response_default, namespace=reg_response_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4516,6 +4572,15 @@ def _make_param_reg_failed(self, code: 'Enum_Parameter', param: 'Optional[Data_R
if reg_failed is None:
reg_failed = []

# NOTE: ``reg`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394). ``failure_type`` above is a
# scalar whose own default is an enumeration member, so it has been
# resolving a member name by inference all along.
if reg_failed_namespace is None:
reg_failed_namespace = Enum_Registration

reg_type = []
for reg in reg_failed:
reg_type.append(self._make_index(reg, reg_failed_default, namespace=reg_failed_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4637,6 +4702,14 @@ def _make_param_transport_format_list(self, code: 'Enum_Parameter', param: 'Opti
if formats is None:
formats = []

# NOTE: ``tf`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394). A transport format is a
# parameter code, so the namespace is ``Enum_Parameter`` itself.
if format_namespace is None:
format_namespace = Enum_Parameter

tf_type = []
for tf in formats:
tf_type.append(self._make_index(tf, format_default, namespace=format_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4681,6 +4754,13 @@ def _make_param_esp_transform(self, code: 'Enum_Parameter', param: 'Optional[Dat
if suites is None:
suites = []

# NOTE: ``suite`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if suite_namespace is None:
suite_namespace = Enum_ESPTransformSuite

suite_id = []
for suite in suites:
suite_id.append(self._make_index(suite, suite_default, namespace=suite_namespace, # type: ignore[arg-type]
Expand Down Expand Up @@ -4926,6 +5006,13 @@ def _make_param_hip_transport_mode(self, code: 'Enum_Parameter', param: 'Optiona
if modes is None:
modes = []

# NOTE: ``mode`` is a loop variable rather than an argument of this
# maker, so ``_make_index`` has no argument default to infer the
# namespace of a :obj:`str` member name from; name it here rather than
# leave the name unresolvable (#2394).
if mode_namespace is None:
mode_namespace = Enum_Transport

mode_id = []
for mode in modes:
mode_id.append(self._make_index(mode, mode_default, namespace=mode_namespace, # type: ignore[arg-type]
Expand Down
Loading
Loading