diff options
author | Michael Mann <mmann78@netscape.net> | 2013-05-27 17:30:43 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-05-27 17:30:43 +0000 |
commit | ea177a2575dc4900c7ef2aa78bfe9b2a1173f7fb (patch) | |
tree | 626615fdfd431d78baefe2e59fb28f6b774959aa /epan/dissectors/packet-netanalyzer.c | |
parent | c6af00a977cf7c7a3c914c79009eaa87bd19c56f (diff) |
Batch of filterable expert infos
svn path=/trunk/; revision=49596
Diffstat (limited to 'epan/dissectors/packet-netanalyzer.c')
-rw-r--r-- | epan/dissectors/packet-netanalyzer.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 4c5f888c92..cec6eda34c 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -139,10 +139,13 @@ static gint hf_netanalyzer_status_short_frame = -1; static gint hf_netanalyzer_status_short_preamble = -1; static gint hf_netanalyzer_status_long_preamble = -1; -static gint ett_netanalyzer = -1; +static gint ett_netanalyzer = -1; static gint ett_netanalyzer_status = -1; static gint ett_netanalyzer_transparent = -1; +static expert_field ei_netanalyzer_header_version_wrong = EI_INIT; +static expert_field ei_netanalyzer_gpio_def_none = EI_INIT; +static expert_field ei_netanalyzer_header_version_none = EI_INIT; /* common routine for Ethernet and transparent mode */ static int @@ -179,7 +182,7 @@ dissect_netanalyzer_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (version != 1) { /* something is wrong */ - expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Wrong netANALYZER header version"); + expert_add_info(pinfo, ti, &ei_netanalyzer_header_version_wrong); return FALSE; } @@ -293,7 +296,7 @@ dissect_netanalyzer_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* something is wrong */ - expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "No valid netANALYZER GPIO definition found"); + expert_add_info(pinfo, ti, &ei_netanalyzer_gpio_def_none); } return FALSE; } @@ -322,11 +325,8 @@ dissect_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* something is wrong */ - if (tree) - { - ti = proto_tree_add_text(tree, tvb, 4, tvb_length(tvb)-4, "netANALYZER"); - expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "No netANALYZER header found"); - } + ti = proto_tree_add_text(tree, tvb, 4, tvb_length(tvb)-4, "netANALYZER"); + expert_add_info(pinfo, ti, &ei_netanalyzer_header_version_none); } } @@ -360,11 +360,8 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t else { /* something is wrong */ - if (tree) - { - ti = proto_tree_add_text(tree, tvb, 4, tvb_length(tvb)-4, "netANALYZER transparent mode"); - expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "No netANALYZER header found"); - } + ti = proto_tree_add_text(tree, tvb, 4, tvb_length(tvb)-4, "netANALYZER transparent mode"); + expert_add_info(pinfo, ti, &ei_netanalyzer_header_version_none); } } @@ -445,6 +442,14 @@ void proto_register_netanalyzer(void) &ett_netanalyzer_transparent, }; + static ei_register_info ei[] = { + { &ei_netanalyzer_header_version_wrong, { "netanalyzer.header_version.wrong", PI_PROTOCOL, PI_ERROR, "Wrong netANALYZER header version", EXPFILL }}, + { &ei_netanalyzer_gpio_def_none, { "netanalyzer.gpio_def_none", PI_MALFORMED, PI_ERROR, "No valid netANALYZER GPIO definition found", EXPFILL }}, + { &ei_netanalyzer_header_version_none, { "netanalyzer.header_version.none", PI_MALFORMED, PI_ERROR, "No netANALYZER header found", EXPFILL }}, + }; + + expert_module_t* expert_netanalyzer; + proto_netanalyzer = proto_register_protocol ( "netANALYZER", /* name */ "netANALYZER", /* short name */ @@ -452,6 +457,8 @@ void proto_register_netanalyzer(void) proto_register_field_array(proto_netanalyzer, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + expert_netanalyzer = expert_register_protocol(proto_netanalyzer); + expert_register_field_array(expert_netanalyzer, ei, array_length(ei)); } |