diff options
author | Michael Mann <mmann78@netscape.net> | 2014-08-08 09:19:29 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-08-09 01:57:08 +0000 |
commit | cd02af56a1e39c66b44fd7957aff3b7b77a59e9d (patch) | |
tree | 4a3e859751bb73268115a607e9dffcec008bb411 /asn1/gprscdr | |
parent | bb15274a4a82fcab1c06935fa1e249f436420a02 (diff) | |
download | wireshark-cd02af56a1e39c66b44fd7957aff3b7b77a59e9d.tar.gz |
Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions.
Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree.
Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141
Reviewed-on: https://code.wireshark.org/review/3500
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/gprscdr')
-rw-r--r-- | asn1/gprscdr/gprscdr.cnf | 2 | ||||
-rw-r--r-- | asn1/gprscdr/packet-gprscdr-template.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/asn1/gprscdr/gprscdr.cnf b/asn1/gprscdr/gprscdr.cnf index 4166d69882..d060f16635 100644 --- a/asn1/gprscdr/gprscdr.cnf +++ b/asn1/gprscdr/gprscdr.cnf @@ -51,7 +51,7 @@ GPRSRecord #.FN_BODY ManagementExtension/information - proto_tree_add_text(tree, tvb, offset, -1, "Not dissected"); + proto_tree_add_expert(tree, actx->pinfo, &ei_gprscdr_not_dissected, tvb, offset, -1); #.FN_BODY TimeStamp VAL_PTR = ¶meter_tvb /* diff --git a/asn1/gprscdr/packet-gprscdr-template.c b/asn1/gprscdr/packet-gprscdr-template.c index b68433ca8d..ab90fe9602 100644 --- a/asn1/gprscdr/packet-gprscdr-template.c +++ b/asn1/gprscdr/packet-gprscdr-template.c @@ -25,6 +25,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -48,6 +49,8 @@ static int ett_gprscdr_timestamp = -1; static int ett_gprscdr_plmn_id = -1; #include "packet-gprscdr-ett.c" +static expert_field ei_gprscdr_not_dissected = EI_INIT; + static const value_string gprscdr_daylight_saving_time_vals[] = { {0, "No adjustment"}, {1, "+1 hour adjustment for Daylight Saving Time"}, @@ -77,10 +80,18 @@ proto_register_gprscdr(void) #include "packet-gprscdr-ettarr.c" }; + static ei_register_info ei[] = { + { &ei_gprscdr_not_dissected, { "gprscdr.not_dissected", PI_UNDECODED, PI_WARN, "Not dissected", EXPFILL }}, + }; + + expert_module_t* expert_gprscdr; + proto_gprscdr = proto_register_protocol(PNAME, PSNAME, PFNAME); proto_register_field_array(proto_gprscdr, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + expert_gprscdr = expert_register_protocol(proto_gprscdr); + expert_register_field_array(expert_gprscdr, ei, array_length(ei)); } /* The registration hand-off routine */ |