[JarryShaw]

• Searched for similar pull requests
• Followed the coding style (make pylint, make mypy, make isort)
• make test passes, and a test case covers the change
• Changelog entry: N/A — centralised in chore(docs): centralise changelog entries for unreleased versions #2483

What is the purpose of your pull request?

• refactor — changes neither behaviour nor performance

---

Description of your pull request and other information

A protocol's __index__ returns its LinkType, EtherType, TransType or AppType value where one exists, as the owner ruled in session. registry-protocol.rst records the rule.

• Changed:
  • Radiotap, FRAD and GRE return their LinkType or TransType member.
  • L2TPv2, FTP, FTP_DATA, HTTP, NGAP, TLS, SSLv3 and DTLS return their port as an int.
• Raise as before: SSLv2 and the SSL base, since nothing dispatches to them.
• Owner answers on refactor(protocols): __index__ returns the protocol's LinkType, EtherType, TransType or AppType value where one exists #2627:
  • TLS and DTLS return the port they are dispatched under (TCP.https_443, UDP.coaps).
  • Netlink keeps ARPHRD.NETLINK.
  • FRAD's and GRE's bindings are feat(protocols): bind FRAD's and GRE's standard registry values #2649.
  • Not breaking: classes that raised now return a value, and no released value changes. IPv4, IPv6 and IPX keep their 1.5.x TransType value.
• Lazy imports: TLS and DTLS import their registry inside __index__, so import pcapkit still leaves apptype.tcp and apptype.udp unloaded.

Dispatch maps and every capture are identical to main. Sonnet cross-reviews confirmed the code at each round. The last one asked for one docs sentence, which this head fixes.

Closes #2627

[JarryShaw]

GOOD TO GO at 67bca4635. A Sonnet cross-review checked the code: a census of every Protocol subclass against main and v1.5.1, a registry lookup of each returned value, lazy imports in fresh interpreters, and identical dispatch maps and captures. The one docs sentence it asked for (IPv4/IPv6 are also LinkType-keyed) is fixed in this head.

[JarryShaw]

resolve conflicts

[JarryShaw]

The owner asked for the conflicts to be resolved. They are with #2651's rewrite of http.py and http.rst. The worker is rebasing onto main (8f6aee6a8) now, and a note follows when it is pushed.

[JarryShaw]

Conflicts resolved, rebased onto main (8f6aee6a8): 67bca4635 → e56b57c92.

• http.py: __index__ sits before refactor(application)!: the HTTP base follows the versioned-family rules (#2628) #2651's new HTTP.__init__, in member order. Both are unchanged: __index__ returns int(TCP.http), and __init__ keeps its version and preface refusals.
• http.rst: the automethod entries follow the same order.
• gre.py: merged on its own, keeping feat(protocols): verify the IGMP and GRE checksums (#2618) #2654's checksum code.

The patch-id outside the two resolved files is identical (c03d95d42348). Dispatch maps and captures are identical to main. The verdict stays good to go.