diff options
Diffstat (limited to 'epan/dissectors/packet-ecp.c')
| -rw-r--r-- | epan/dissectors/packet-ecp.c | 100 |
1 files changed, 49 insertions, 51 deletions
diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c index 2fd6098b4a..87c951103e 100644 --- a/epan/dissectors/packet-ecp.c +++ b/epan/dissectors/packet-ecp.c @@ -10,7 +10,6 @@ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/to_str.h> @@ -22,47 +21,50 @@ void proto_register_vdp(void); void proto_reg_handoff_ecp_21(void); void proto_reg_handoff_vdp(void); -static int proto_ecp = -1; -static int hf_ecp_version = -1; -static int hf_ecp_op = -1; -static int hf_ecp_subtype = -1; -static int hf_ecp_seqno = -1; - -static int proto_vdp = -1; -static int hf_vdp_tlv_type = -1; -static int hf_vdp_tlv_len = -1; -static int hf_vdp_tlv_assoc_reason = -1; -static int hf_vdp_vidstr_ps = -1; -static int hf_vdp_vidstr_pcp = -1; -static int hf_vdp_vidstr_vid = -1; -static int hf_vdp_vsitypeid = -1; -static int hf_vdp_vsiversion = -1; -static int hf_vdp_vsiid_format = -1; -static int hf_vdp_vsiid = -1; -static int hf_vdp_filter_format = -1; -static int hf_vdp_assoc_mac_id = -1; -static int hf_vdp_manager_id = -1; -static int hf_vdp_data = -1; -static int hf_vdp_tlv_org_oui = -1; -static int hf_vdp_tlv_oracle_subtype = -1; -static int hf_vdp_tlv_assoc_flag_mbit = -1; -static int hf_vdp_tlv_assoc_flag_sbit = -1; -static int hf_vdp_tlv_assoc_flag_req_rsp = -1; -static int hf_vdp_tlv_assoc_request_flags = -1; -static int hf_vdp_tlv_assoc_flag_hard_error = -1; -static int hf_vdp_tlv_assoc_flag_keep = -1; -static int hf_vdp_tlv_assoc_error = -1; -static int hf_vdp_tlv_assoc_response_flags = -1; - -static int hf_oui_oracle_encoding = -1; - -static gint ett_ecp = -1; -static gint ett_vdp_tlv = -1; -static gint ett_vdp_tlv_assoc = -1; -static gint ett_vdp_tlv_org = -1; -static gint ett_vdp_assoc_flags = -1; - -static expert_field ei_vdp_tlvlen_bad = EI_INIT; +static dissector_handle_t ecp_handle; +static dissector_handle_t vdp_handle; + +static int proto_ecp; +static int hf_ecp_version; +static int hf_ecp_op; +static int hf_ecp_subtype; +static int hf_ecp_seqno; + +static int proto_vdp; +static int hf_vdp_tlv_type; +static int hf_vdp_tlv_len; +static int hf_vdp_tlv_assoc_reason; +static int hf_vdp_vidstr_ps; +static int hf_vdp_vidstr_pcp; +static int hf_vdp_vidstr_vid; +static int hf_vdp_vsitypeid; +static int hf_vdp_vsiversion; +static int hf_vdp_vsiid_format; +static int hf_vdp_vsiid; +static int hf_vdp_filter_format; +static int hf_vdp_assoc_mac_id; +static int hf_vdp_manager_id; +static int hf_vdp_data; +static int hf_vdp_tlv_org_oui; +static int hf_vdp_tlv_oracle_subtype; +static int hf_vdp_tlv_assoc_flag_mbit; +static int hf_vdp_tlv_assoc_flag_sbit; +static int hf_vdp_tlv_assoc_flag_req_rsp; +static int hf_vdp_tlv_assoc_request_flags; +static int hf_vdp_tlv_assoc_flag_hard_error; +static int hf_vdp_tlv_assoc_flag_keep; +static int hf_vdp_tlv_assoc_error; +static int hf_vdp_tlv_assoc_response_flags; + +static int hf_oui_oracle_encoding; + +static gint ett_ecp; +static gint ett_vdp_tlv; +static gint ett_vdp_tlv_assoc; +static gint ett_vdp_tlv_org; +static gint ett_vdp_assoc_flags; + +static expert_field ei_vdp_tlvlen_bad; static dissector_table_t ecp_subdissector_table; @@ -432,6 +434,7 @@ proto_register_ecp(void) proto_register_field_array(proto_ecp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + ecp_handle = register_dissector("ecp21", dissect_ecp, proto_ecp); ecp_subdissector_table = register_dissector_table("ecp.subtype", "ECP Subtypes", proto_ecp, FT_UINT32, BASE_DEC); } @@ -465,7 +468,7 @@ proto_register_vdp(void) NULL, 0x20, NULL, HFILL }}, { &hf_vdp_tlv_assoc_flag_req_rsp, { "Response", "vdp21.assoc.flags.req_rsp", FT_BOOLEAN, 8, - TFS(&tfs_true_false), 0x40, NULL, HFILL }}, + NULL, 0x40, NULL, HFILL }}, { &hf_vdp_tlv_assoc_flag_hard_error, { "Hard Error", "vdp21.assoc.flags.hard_error", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, @@ -498,10 +501,10 @@ proto_register_vdp(void) NULL, 0x0, NULL, HFILL }}, { &hf_vdp_vidstr_ps, { "VIDSTR PS", "vdp21.vidstr.ps", FT_UINT16, BASE_HEX, - NULL, 0x800, NULL, HFILL }}, + NULL, 0x0800, NULL, HFILL }}, { &hf_vdp_vidstr_pcp, { "VIDSTR PCP", "vdp21.vidstr.pcp", FT_UINT16, BASE_HEX, - NULL, 0x700, NULL, HFILL }}, + NULL, 0x0700, NULL, HFILL }}, { &hf_vdp_vidstr_vid, { "VIDSTR VID", "vdp21.vidstr.vid", FT_UINT16, BASE_HEX, NULL, 0x0FFF, NULL, HFILL }}, @@ -538,23 +541,18 @@ proto_register_vdp(void) expert_vdp = expert_register_protocol(proto_vdp); expert_register_field_array(expert_vdp, ei, array_length(ei)); + vdp_handle = register_dissector("vdp21", dissect_vdp, proto_vdp); } void proto_reg_handoff_ecp_21(void) { - dissector_handle_t ecp_handle; - - ecp_handle = create_dissector_handle(dissect_ecp, proto_ecp); dissector_add_uint("ethertype", ETHERTYPE_ECP, ecp_handle); } void proto_reg_handoff_vdp(void) { - dissector_handle_t vdp_handle; - - vdp_handle = create_dissector_handle(dissect_vdp, proto_vdp); dissector_add_uint("ecp.subtype", ECP_SUBTYPE_VDP, vdp_handle); } |