diff options
Diffstat (limited to 'epan/dissectors/packet-extreme.c')
| -rw-r--r-- | epan/dissectors/packet-extreme.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 936f20d80b..a25f01ca4f 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -150,7 +150,6 @@ These are the structures you will see most often in EDP frames. void proto_register_edp(void); void proto_reg_handoff_edp(void); -void proto_register_extreme_oui(void); static int hf_llc_extreme_pid = -1; @@ -1448,6 +1447,14 @@ proto_register_edp(void) { "End", "edp.null", FT_PROTOCOL, BASE_NONE, NULL, 0x0, "Last element", HFILL }}, }; + + static hf_register_info extreme_hf[] = { + { &hf_llc_extreme_pid, + { "PID", "llc.extreme_pid", FT_UINT16, BASE_HEX, + VALS(extreme_pid_vals), 0x0, NULL, HFILL } + } + }; + static gint *ett[] = { &ett_edp, &ett_edp_checksum, @@ -1477,6 +1484,9 @@ proto_register_edp(void) proto_register_subtree_array(ett, array_length(ett)); expert_edp = expert_register_protocol(proto_edp); expert_register_field_array(expert_edp, ei, array_length(ei)); + + llc_add_oui(OUI_EXTREME, "llc.extreme_pid", "LLC Extreme OUI PID", extreme_hf, proto_edp); + } void @@ -1488,19 +1498,6 @@ proto_reg_handoff_edp(void) dissector_add_uint("llc.extreme_pid", 0x00bb, edp_handle); } -void -proto_register_extreme_oui(void) -{ - static hf_register_info hf[] = { - { &hf_llc_extreme_pid, - { "PID", "llc.extreme_pid", FT_UINT16, BASE_HEX, - VALS(extreme_pid_vals), 0x0, NULL, HFILL } - } - }; - - llc_add_oui(OUI_EXTREME, "llc.extreme_pid", "LLC Extreme OUI PID", hf); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |