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-s5066sis.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-s5066sis.c')
| -rw-r--r-- | epan/dissectors/packet-s5066sis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-s5066sis.c b/epan/dissectors/packet-s5066sis.c index 8123384ca0..c7d5dac093 100644 --- a/epan/dissectors/packet-s5066sis.c +++ b/epan/dissectors/packet-s5066sis.c @@ -25,6 +25,7 @@ # define SAPID_UDOP 7 /* Forward reference */ +static dissector_handle_t s5066_tcp_handle; /* Register functions */ void proto_register_s5066(void); void proto_reg_handoff_s5066(void); @@ -1413,6 +1414,8 @@ proto_register_s5066(void) proto_register_field_array(proto_s5066, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + s5066_tcp_handle = register_dissector("s5066sis", dissect_s5066_tcp, proto_s5066); + s5066_module = prefs_register_protocol(proto_s5066, proto_reg_handoff_s5066); prefs_register_bool_preference(s5066_module, "desegment_pdus", "Reassemble S5066 SIS PDUs spanning multiple TCP segments", @@ -1433,10 +1436,8 @@ void proto_reg_handoff_s5066(void) { static gboolean Initialized = FALSE; - static dissector_handle_t s5066_tcp_handle; if (!Initialized) { - s5066_tcp_handle = create_dissector_handle(dissect_s5066_tcp, proto_s5066); dissector_add_uint_with_preference("tcp.port", S5066_PORT, s5066_tcp_handle); Initialized = TRUE; } |