diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-07-09 13:47:59 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-16 11:12:29 +0000 |
| commit | 7d65b573f2734017be416f31852c4ede42bd987b (patch) | |
| tree | 5fc5e6ebe6c44a5060292541f9664f0244a5e0e4 /epan/dissectors/packet-aruba-erm.c | |
| parent | d992e85fe8e9192cb730abf8796336d3b6d6fd50 (diff) | |
Have register_decode_as_next_proto create dissector table.
For protocols that have don't have a unique identifier for their
payload, have register_decode_as_next_proto be a one stop shop to
create Decode As functionality and a dissector table of type FT_NONE.
Change-Id: Ic1f2e9ed0aee0554a4eb8f232630b99c0604dfc0
Reviewed-on: https://code.wireshark.org/review/22575
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-aruba-erm.c')
| -rw-r--r-- | epan/dissectors/packet-aruba-erm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c index d27bd87cc6..207c0afd37 100644 --- a/epan/dissectors/packet-aruba-erm.c +++ b/epan/dissectors/packet-aruba-erm.c @@ -205,11 +205,7 @@ dissect_aruba_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat { int offset = 0; - /* - * Implement "Decode As", as Aruba ERM doesn't - * have a unique identifier to determine subdissector - */ - if (!dissector_try_uint(aruba_erm_subdissector_table, 0, tvb, pinfo, tree)) { + if (!dissector_try_payload(aruba_erm_subdissector_table, tvb, pinfo, tree)) { dissect_aruba_erm_common(tvb, pinfo, tree, &offset); /* Add Expert info how decode...*/ @@ -432,11 +428,9 @@ proto_register_aruba_erm(void) expert_register_field_array(expert_aruba_erm, ei, array_length(ei)); register_dissector("aruba_erm", dissect_aruba_erm, proto_aruba_erm); - aruba_erm_subdissector_table = register_dissector_table( - "aruba_erm.type", "Aruba ERM Type", proto_aruba_erm, - FT_UINT32, BASE_DEC); - register_decode_as_next_proto("aruba_erm", "Aruba ERM Type", "aruba_erm.type", (build_label_func*)&aruba_erm_prompt); + aruba_erm_subdissector_table = register_decode_as_next_proto(proto_aruba_erm, "Aruba ERM Type", "aruba_erm.type", + "Aruba ERM Type", (build_label_func*)&aruba_erm_prompt); } void |