osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

[GPRS CDR] Add expert info for unknown record types. 

Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15
Reviewed-on: https://code.wireshark.org/review/6504
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2015-01-12 13:58:49 +01:00 committed by Anders Broman
parent d7bce33140
commit 554a3972cd
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
asn1/gprscdr/gprscdr.cnf
View File

@ -153,6 +153,20 @@ GPRSRecord
subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id);
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, TRUE);
#.FN_BODY GPRSRecord VAL_PTR = &branch_taken
proto_item *item;
gint branch_taken, t_offset = offset;
gint32 tag;
%(DEFAULT_BODY)s
if(branch_taken == -1){
get_ber_identifier(tvb, t_offset, NULL, NULL, &tag);
item = proto_tree_add_uint(tree, hf_index, tvb, t_offset, 1, tag);
dissect_ber_identifier(actx->pinfo, tree, tvb, t_offset, NULL, NULL, &tag);
expert_add_info_format(actx->pinfo, item, &ei_gprscdr_choice_not_found,
"Record type(BER choice) not found: %%u", tag);
}
#.TYPE_ATTR
IPBinaryAddress/iPBinV4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE
IPBinaryAddress/iPBinV6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE

2
asn1/gprscdr/packet-gprscdr-template.c
View File

@ -50,6 +50,7 @@ static int ett_gprscdr_managementextension_information = -1;
#include "packet-gprscdr-ett.c"
static expert_field ei_gprscdr_not_dissected = EI_INIT;
static expert_field ei_gprscdr_choice_not_found = EI_INIT;
/* Global variables */
static const char *obj_id = NULL;
@ -86,6 +87,7 @@ proto_register_gprscdr(void)
static ei_register_info ei[] = {
{ &ei_gprscdr_not_dissected, { "gprscdr.not_dissected", PI_UNDECODED, PI_WARN, "Not dissected", EXPFILL }},
{ &ei_gprscdr_choice_not_found, { "gprscdr.error.choice_not_found", PI_MALFORMED, PI_WARN, "GPRS CDR Error: This choice field(Record type) was not found", EXPFILL }},
};
expert_module_t* expert_gprscdr;

27
epan/dissectors/packet-gprscdr.c
View File

@ -437,6 +437,7 @@ static gint ett_gprscdr_UserCSGInformation = -1;
#line 51 "../../asn1/gprscdr/packet-gprscdr-template.c"
static expert_field ei_gprscdr_not_dissected = EI_INIT;
static expert_field ei_gprscdr_choice_not_found = EI_INIT;
/* Global variables */
static const char *obj_id = NULL;
@ -3126,9 +3127,24 @@ static const ber_choice_t GPRSRecord_choice[] = {
int
dissect_gprscdr_GPRSRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_choice(actx, tree, tvb, offset,
#line 157 "../../asn1/gprscdr/gprscdr.cnf"
proto_item *item;
gint branch_taken, t_offset = offset;
gint32 tag;
offset = dissect_ber_choice(actx, tree, tvb, offset,
GPRSRecord_choice, hf_index, ett_gprscdr_GPRSRecord,
NULL);
&branch_taken);
if(branch_taken == -1){
get_ber_identifier(tvb, t_offset, NULL, NULL, &tag);
item = proto_tree_add_uint(tree, hf_index, tvb, t_offset, 1, tag);
dissect_ber_identifier(actx->pinfo, tree, tvb, t_offset, NULL, NULL, &tag);
expert_add_info_format(actx->pinfo, item, &ei_gprscdr_choice_not_found,
"Record type(BER choice) not found: %u", tag);
}
return offset;
}
@ -3152,7 +3168,7 @@ int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
/*--- End of included file: packet-gprscdr-fn.c ---*/
#line 66 "../../asn1/gprscdr/packet-gprscdr-template.c"
#line 67 "../../asn1/gprscdr/packet-gprscdr-template.c"
@ -4395,7 +4411,7 @@ proto_register_gprscdr(void)
NULL, HFILL }},
/*--- End of included file: packet-gprscdr-hfarr.c ---*/
#line 76 "../../asn1/gprscdr/packet-gprscdr-template.c"
#line 77 "../../asn1/gprscdr/packet-gprscdr-template.c"
};
/* List of subtrees */
@ -4470,11 +4486,12 @@ proto_register_gprscdr(void)
&ett_gprscdr_UserCSGInformation,
/*--- End of included file: packet-gprscdr-ettarr.c ---*/
#line 85 "../../asn1/gprscdr/packet-gprscdr-template.c"
#line 86 "../../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 }},
{ &ei_gprscdr_choice_not_found, { "gprscdr.error.choice_not_found", PI_MALFORMED, PI_WARN, "GPRS CDR Error: This choice field(Record type) was not found", EXPFILL }},
};
expert_module_t* expert_gprscdr;