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-sflow.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-sflow.c')
-rw-r--r-- | epan/dissectors/packet-sflow.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index c86fecb9ec..44185efa92 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -3794,6 +3794,9 @@ proto_register_sflow(void) { header_subdissector_table = register_dissector_table("sflow_245.header_protocol", "SFLOW header protocol", proto_sflow, FT_UINT32, BASE_DEC); + /* Register our dissector handle */ + sflow_handle = register_dissector("sflow", dissect_sflow_245, proto_sflow); + /* Register our configuration options for sFlow */ sflow_245_module = prefs_register_protocol(proto_sflow, NULL); @@ -3828,7 +3831,6 @@ proto_register_sflow(void) { void proto_reg_handoff_sflow_245(void) { - sflow_handle = create_dissector_handle(dissect_sflow_245, proto_sflow); dissector_add_uint_range_with_preference("udp.port", SFLOW_UDP_PORTS, sflow_handle); } |