diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-07-08 21:48:36 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-11 08:41:49 +0000 |
| commit | 9b3c8d4515c9a1a307c141c25fa59694391efe3a (patch) | |
| tree | b71ff7c6590321de7a9f7141f2e4f3cf39bb426b /epan/dissectors/packet-rtacser.c | |
| parent | d4d30faeb85c5adf39aca3ae5e52db225c88ea48 (diff) | |
Expand register_decode_as_next_proto to include prompt string.
Many dissectors don't have an identifier to pass to a dissector table.
When using Decode As they all have a "value" function that returns 0
just so something is returned.
A first step to a cleaner refactor of the functionality is to allow
dissectors to provide a "prompt" function when registering Decode As
with register_decode_as_next_proto() so that the text exposed in
the GUI can vary, but the function that returns 0 (nothing) can be
consolidated under decode as registration functionality. This casts
a wider net for register_decode_as_next_proto() use.
Change-Id: I2995b3c251dae70f5f529b672473d25c6288ed5c
Reviewed-on: https://code.wireshark.org/review/22562
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rtacser.c')
| -rw-r--r-- | epan/dissectors/packet-rtacser.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index 7030f0fff9..87867ac7fe 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -120,12 +120,6 @@ rtacser_ppi_prompt(packet_info *pinfo _U_, gchar* result) g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Payload as"); } -static gpointer -rtacser_ppi_value(packet_info *pinfo _U_) -{ - return 0; -} - /******************************************************************************************************/ /* Code to dissect RTAC Serial-Line Protocol packets */ /******************************************************************************************************/ @@ -280,11 +274,6 @@ proto_register_rtacser(void) &ett_rtacser_cl, }; - static build_valid_func rtacser_da_ppi_build_value[1] = {rtacser_ppi_value}; - static decode_as_value_t rtacser_da_ppi_values[1] = {{rtacser_ppi_prompt, 1, rtacser_da_ppi_build_value}}; - static decode_as_t rtacser_da_ppi = {"rtacser", "RTAC Serial", "rtacser.data", 1, 0, rtacser_da_ppi_values, "RTAC Serial", NULL, - decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL}; - module_t *rtacser_module; /* Register the protocol name and description */ @@ -305,7 +294,7 @@ proto_register_rtacser(void) /* RTAC Serial Preference - Payload Protocol in use */ prefs_register_obsolete_preference(rtacser_module, "rtacserial_payload_proto"); - register_decode_as(&rtacser_da_ppi); + register_decode_as_next_proto("rtacser", "RTAC Serial", "rtacser.data", (build_label_func*)&rtacser_ppi_prompt); } /******************************************************************************************************/ |