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 /epan/dissectors/packet-gprscdr.c | |
| parent | bb15274a4a82fcab1c06935fa1e249f436420a02 (diff) | |
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 'epan/dissectors/packet-gprscdr.c')
| -rw-r--r-- | epan/dissectors/packet-gprscdr.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index dfdbd36c3c..f384d95ed5 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -33,6 +33,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/expert.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -335,7 +336,7 @@ static int hf_gprscdr_ServiceConditionChange_tAIChange = -1; static int hf_gprscdr_ServiceConditionChange_userLocationChange = -1; /*--- End of included file: packet-gprscdr-hf.c ---*/ -#line 45 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 46 "../../asn1/gprscdr/packet-gprscdr-template.c" static int ett_gprscdr = -1; static int ett_gprscdr_timestamp = -1; @@ -400,7 +401,9 @@ static gint ett_gprscdr_TWANUserLocationInfo = -1; static gint ett_gprscdr_UserCSGInformation = -1; /*--- End of included file: packet-gprscdr-ett.c ---*/ -#line 50 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 51 "../../asn1/gprscdr/packet-gprscdr-template.c" + +static expert_field ei_gprscdr_not_dissected = EI_INIT; static const value_string gprscdr_daylight_saving_time_vals[] = { {0, "No adjustment"}, @@ -597,7 +600,7 @@ static int dissect_gprscdr_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 53 "../../asn1/gprscdr/gprscdr.cnf" - proto_tree_add_text(tree, tvb, offset, -1, "Not dissected"); + proto_tree_add_expert(tree, actx->pinfo, &ei_gprscdr_not_dissected, tvb, offset, -1); @@ -2936,7 +2939,7 @@ int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-gprscdr-fn.c ---*/ -#line 60 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 63 "../../asn1/gprscdr/packet-gprscdr-template.c" @@ -4071,7 +4074,7 @@ proto_register_gprscdr(void) NULL, HFILL }}, /*--- End of included file: packet-gprscdr-hfarr.c ---*/ -#line 70 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 73 "../../asn1/gprscdr/packet-gprscdr-template.c" }; /* List of subtrees */ @@ -4139,13 +4142,21 @@ proto_register_gprscdr(void) &ett_gprscdr_UserCSGInformation, /*--- End of included file: packet-gprscdr-ettarr.c ---*/ -#line 78 "../../asn1/gprscdr/packet-gprscdr-template.c" +#line 81 "../../asn1/gprscdr/packet-gprscdr-template.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 */ |