diff options
author | David Perry <boolean263@protonmail.com> | 2023-09-19 14:12:28 -0400 |
---|---|---|
committer | AndersBroman <a.broman58@gmail.com> | 2023-09-19 19:06:51 +0000 |
commit | fb9d01556dbc28a507778f66cbaca234a55e6305 (patch) | |
tree | 6bd4e8351e33d1519492b96ae9baf69eef6ee678 /epan/dissectors/packet-sccpmg.c | |
parent | d4f47c60b7eb12a84348d5c0228f6b5afd013660 (diff) |
Use `register_dissector()` for more protocols
Changes several calls of `create_dissector_handle()` to instead call
`register_dissector()` with a name for the dissector.
This should handle all dissectors in `epan/` from `packet-p*` to
`packet-v*`.
This change allows affected dissectors to be findable by calls to
`find_dissector()`. In turn, this opens up more command-line use for
these protocols, including fuzzshark and rawshark, as well as lua use
via `Dissector.get()`.
Where needed, move the call from the protocol handoff function to the
protocol register function, save the result in a static variable,
and use that variable in the handoff function.
There were some calls to `create_dissector_handle()` or
`register_dissector()` which passed `-1` as the protocol argument. When
I saw those I corrected them to pass the actual `proto_foo` identifier
instead.
Partially addresses #5612
Diffstat (limited to 'epan/dissectors/packet-sccpmg.c')
-rw-r--r-- | epan/dissectors/packet-sccpmg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index 944d6c43e9..a37115e912 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -42,6 +42,8 @@ void proto_register_sccpmg(void); void proto_reg_handoff_sccpmg(void); +static dissector_handle_t sccpmg_handle; + /* Same as below but with names typed out */ static const value_string sccpmg_message_type_values[] = { { SCCPMG_MESSAGE_TYPE_SSA, "SubSystem Allowed" }, @@ -337,15 +339,14 @@ proto_register_sccpmg(void) proto_register_subtree_array(ett, array_length(ett)); expert_sccpmg = expert_register_protocol(proto_sccpmg); expert_register_field_array(expert_sccpmg, ei, array_length(ei)); + + /* Register the dissector handle */ + sccpmg_handle = register_dissector("sccpmg", dissect_sccpmg, proto_sccpmg); } void proto_reg_handoff_sccpmg(void) { - dissector_handle_t sccpmg_handle; - - sccpmg_handle = create_dissector_handle(dissect_sccpmg, proto_sccpmg); - /* Register for SCCP SSN=1 messages */ dissector_add_uint("sccp.ssn", SCCPMG_SSN, sccpmg_handle); } |