aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-elmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-elmi.c')
-rw-r--r--epan/dissectors/packet-elmi.c108
1 files changed, 54 insertions, 54 deletions
diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c
index 63dbcd2dfe..2e8bfdef3f 100644
--- a/epan/dissectors/packet-elmi.c
+++ b/epan/dissectors/packet-elmi.c
@@ -21,56 +21,58 @@
#include <epan/etypes.h>
-static int proto_elmi = -1;
+static int proto_elmi;
void proto_register_elmi(void);
void proto_reg_handoff_elmi(void);
-static gint ett_elmi = -1;
-static gint ett_elmi_info_elem = -1;
-static gint ett_elmi_sub_info_elem = -1;
-
-static int hf_elmi_ver = -1;
-static int hf_elmi_msg_type = -1;
-static int hf_elmi_info_elem = -1;
-static int hf_elmi_info_elem_len = -1;
-static int hf_elmi_report_type = -1;
-static int hf_elmi_snd_seq_num = -1;
-static int hf_elmi_rcv_seq_num = -1;
-static int hf_elmi_dat_inst = -1;
-static int hf_elmi_reserved = -1;
-static int hf_elmi_uni_status = -1;
-static int hf_elmi_evc_refid = -1;
-static int hf_elmi_evc_status = -1;
-static int hf_last_ie = -1;
-static int hf_map_seq = -1;
-static int hf_priority = -1;
-static int hf_default_evc = -1;
-static int hf_elmi_sub_info_elem = -1;
-static int hf_elmi_sub_info_elem_len = -1;
-static int hf_elmi_uni_id = -1;
-static int hf_elmi_evc_type = -1;
-static int hf_elmi_evc_id = -1;
-static int hf_elmi_ce_vlan_id = -1;
-static int hf_elmi_sub_info_color_mode_flag = -1;
-static int hf_elmi_sub_info_coupling_flag = -1;
-static int hf_elmi_sub_info_per_cos_bit = -1;
-static int hf_elmi_sub_cir_magnitude = -1;
-static int hf_elmi_sub_cir_multiplier = -1;
-static int hf_elmi_sub_cbs_magnitude = -1;
-static int hf_elmi_sub_cbs_multiplier = -1;
-static int hf_elmi_sub_eir_magnitude = -1;
-static int hf_elmi_sub_eir_multiplier = -1;
-static int hf_elmi_sub_ebs_magnitude = -1;
-static int hf_elmi_sub_ebs_multiplier = -1;
-static int hf_elmi_sub_user_prio_0 = -1;
-static int hf_elmi_sub_user_prio_1 = -1;
-static int hf_elmi_sub_user_prio_2 = -1;
-static int hf_elmi_sub_user_prio_3 = -1;
-static int hf_elmi_sub_user_prio_4 = -1;
-static int hf_elmi_sub_user_prio_5 = -1;
-static int hf_elmi_sub_user_prio_6 = -1;
-static int hf_elmi_sub_user_prio_7 = -1;
+static dissector_handle_t elmi_handle;
+
+static gint ett_elmi;
+static gint ett_elmi_info_elem;
+static gint ett_elmi_sub_info_elem;
+
+static int hf_elmi_ver;
+static int hf_elmi_msg_type;
+static int hf_elmi_info_elem;
+static int hf_elmi_info_elem_len;
+static int hf_elmi_report_type;
+static int hf_elmi_snd_seq_num;
+static int hf_elmi_rcv_seq_num;
+static int hf_elmi_dat_inst;
+static int hf_elmi_reserved;
+static int hf_elmi_uni_status;
+static int hf_elmi_evc_refid;
+static int hf_elmi_evc_status;
+static int hf_last_ie;
+static int hf_map_seq;
+static int hf_priority;
+static int hf_default_evc;
+static int hf_elmi_sub_info_elem;
+static int hf_elmi_sub_info_elem_len;
+static int hf_elmi_uni_id;
+static int hf_elmi_evc_type;
+static int hf_elmi_evc_id;
+static int hf_elmi_ce_vlan_id;
+static int hf_elmi_sub_info_color_mode_flag;
+static int hf_elmi_sub_info_coupling_flag;
+static int hf_elmi_sub_info_per_cos_bit;
+static int hf_elmi_sub_cir_magnitude;
+static int hf_elmi_sub_cir_multiplier;
+static int hf_elmi_sub_cbs_magnitude;
+static int hf_elmi_sub_cbs_multiplier;
+static int hf_elmi_sub_eir_magnitude;
+static int hf_elmi_sub_eir_multiplier;
+static int hf_elmi_sub_ebs_magnitude;
+static int hf_elmi_sub_ebs_multiplier;
+static int hf_elmi_sub_user_prio_0;
+static int hf_elmi_sub_user_prio_1;
+static int hf_elmi_sub_user_prio_2;
+static int hf_elmi_sub_user_prio_3;
+static int hf_elmi_sub_user_prio_4;
+static int hf_elmi_sub_user_prio_5;
+static int hf_elmi_sub_user_prio_6;
+static int hf_elmi_sub_user_prio_7;
static const value_string elmi_msg_type[] = {
{ 0x75, "Status enquiry" },
@@ -167,7 +169,7 @@ dissect_elmi_sub_info_elem(
switch (sub_tag) {
case SUB_TAG_UNI_ID:
- proto_tree_add_item(sub_info_elem_tree, hf_elmi_uni_id, tvb, offset, len, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(sub_info_elem_tree, hf_elmi_uni_id, tvb, offset, len, ENC_ASCII);
offset += len;
break;
case SUB_TAG_EVC_PRM:
@@ -175,7 +177,7 @@ dissect_elmi_sub_info_elem(
offset++;
break;
case SUB_TAG_EVC_ID:
- proto_tree_add_item(sub_info_elem_tree, hf_elmi_evc_id, tvb, offset, len, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(sub_info_elem_tree, hf_elmi_evc_id, tvb, offset, len, ENC_ASCII);
offset += len;
break;
case SUB_TAG_EVC_MAP:
@@ -424,7 +426,7 @@ proto_register_elmi(void)
{ "Default EVC", "elmi.map.evc", FT_BOOLEAN, 8,
TFS(&tfs_set_notset), 0x1, NULL, HFILL } },
{ &hf_elmi_sub_info_elem,
- { "Sub-Info Element :" , "elmi.sub_info.tag", FT_UINT8, BASE_HEX,
+ { "Sub-Info Element :", "elmi.sub_info.tag", FT_UINT8, BASE_HEX,
VALS(elmi_sub_info_elem_tag), 0, NULL, HFILL } },
{ &hf_elmi_sub_info_elem_len,
{ "Sub-Info Length", "elmi.sub_info.len", FT_UINT8, BASE_DEC,
@@ -507,20 +509,18 @@ proto_register_elmi(void)
};
- proto_elmi = proto_register_protocol(
- "Ethernet Local Management Interface", "E-LMI", "elmi");
+ proto_elmi = proto_register_protocol("Ethernet Local Management Interface", "E-LMI", "elmi");
proto_register_field_array(proto_elmi, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+
+ elmi_handle = register_dissector("elmi", dissect_elmi, proto_elmi);
}
void
proto_reg_handoff_elmi(void)
{
- dissector_handle_t elmi_handle;
-
- elmi_handle = create_dissector_handle(dissect_elmi, proto_elmi);
dissector_add_uint("ethertype", ETHERTYPE_ELMI, elmi_handle);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 05:46:48 +0000