diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-13 07:51:45 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-17 00:05:17 +0000 |
| commit | e37275bfdee7a0ea4745def144d4a0e5c62e282d (patch) | |
| tree | e556a0170b2a35bd4bf975823de4205f7d30ba09 /epan/dissectors/packet-foundry.c | |
| parent | b46fe7e95ae09c062ec066838f05b2c42a3b2726 (diff) | |
Associate dissector tables and heuristic subdissector lists with a protocol.
This will make it easier to determine protocol dependencies.
Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used)
Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d
Reviewed-on: https://code.wireshark.org/review/14446
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-foundry.c')
| -rw-r--r-- | epan/dissectors/packet-foundry.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index 3fead09505..3c9a92858a 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -33,7 +33,6 @@ void proto_register_fdp(void); void proto_reg_handoff_fdp(void); -void proto_register_foundry_oui(void); static int hf_llc_foundry_pid = -1; @@ -429,6 +428,14 @@ proto_register_fdp(void) 0x0, NULL, HFILL }}, }; + + static hf_register_info oui_hf[] = { + { &hf_llc_foundry_pid, + { "PID", "llc.foundry_pid", FT_UINT16, BASE_HEX, + VALS(foundry_pid_vals), 0x0, NULL, HFILL } + } + }; + static gint *ett[] = { &ett_fdp, &ett_fdp_tlv_header, @@ -451,6 +458,8 @@ proto_register_fdp(void) proto_register_subtree_array(ett, array_length(ett)); expert_fdp = expert_register_protocol(proto_fdp); expert_register_field_array(expert_fdp, ei, array_length(ei)); + + llc_add_oui(OUI_FOUNDRY, "llc.foundry_pid", "LLC Foundry OUI PID", oui_hf, proto_fdp); } void @@ -462,19 +471,6 @@ proto_reg_handoff_fdp(void) dissector_add_uint("llc.foundry_pid", 0x2000, fdp_handle); } -void -proto_register_foundry_oui(void) -{ - static hf_register_info hf[] = { - { &hf_llc_foundry_pid, - { "PID", "llc.foundry_pid", FT_UINT16, BASE_HEX, - VALS(foundry_pid_vals), 0x0, NULL, HFILL } - } - }; - - llc_add_oui(OUI_FOUNDRY, "llc.foundry_pid", "LLC Foundry OUI PID", hf); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |