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-mausb.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-mausb.c')
| -rw-r--r-- | epan/dissectors/packet-mausb.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 54a1e36be2..84ca1f0b0d 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -37,7 +37,6 @@ void proto_reg_handoff_mausb(void); void proto_register_mausb(void); -void proto_register_wfa_oui(void); /* For SNAP Packets */ static int hf_llc_mausb_pid = -1; @@ -2191,6 +2190,13 @@ proto_register_mausb(void) }, }; + static hf_register_info oui_hf[] = { + { &hf_llc_mausb_pid, + { "PID", "mausb.pid", FT_UINT16, BASE_HEX, + VALS(mausb_pid_string), 0x0, NULL, HFILL } + } + }; + /* Setup protocol subtree array */ static gint *ett[] = { &ett_mausb, @@ -2272,6 +2278,7 @@ proto_register_mausb(void) "Set the port for Media Agnostic Packets", 10, &mausb_udp_port_pref); + llc_add_oui(OUI_WFA, "llc.wfa_pid", "LLC WFA OUI PID", oui_hf, proto_mausb); } void @@ -2307,19 +2314,6 @@ proto_reg_handoff_mausb(void) dissector_add_uint("udp.port", mausb_udp_port_pref, mausb_pkt_handle); } -void -proto_register_wfa_oui(void) -{ - static hf_register_info hf[] = { - { &hf_llc_mausb_pid, - { "PID", "mausb.pid", FT_UINT16, BASE_HEX, - VALS(mausb_pid_string), 0x0, NULL, HFILL } - } - }; - - llc_add_oui(OUI_WFA, "llc.wfa_pid", "LLC WFA OUI PID", hf); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |