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

RANAP: Simplify private data creation 

Change-Id: Id6dd45789b7418143dc1046dc465a0e60ee87c91
Reviewed-on: https://code.wireshark.org/review/28171
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Darien Spencer 2018-06-09 21:57:32 +03:00 committed by Anders Broman
parent 1aff175b1c
commit 8f3ff1d24d
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/asn1/ranap/packet-ranap-template.c
View File

@ -91,14 +91,11 @@ static ranap_private_data_t* ranap_get_private_data(asn1_ctx_t *actx)
{
packet_info *pinfo = actx->pinfo;
ranap_private_data_t *private_data = (ranap_private_data_t *)p_get_proto_data(pinfo->pool, pinfo, proto_ranap, 0);
if(private_data != NULL ) {
return private_data;
}
else {
if(private_data == NULL ) {
private_data = wmem_new0(pinfo->pool, ranap_private_data_t);
p_add_proto_data(pinfo->pool, pinfo, proto_ranap, 0, private_data);
return private_data;
}
return private_data;
}
/* Helper function to reset the the private data struct */

15
epan/dissectors/packet-ranap.c
View File

@ -1643,14 +1643,11 @@ static ranap_private_data_t* ranap_get_private_data(asn1_ctx_t *actx)
{
packet_info *pinfo = actx->pinfo;
ranap_private_data_t *private_data = (ranap_private_data_t *)p_get_proto_data(pinfo->pool, pinfo, proto_ranap, 0);
if(private_data != NULL ) {
return private_data;
}
else {
if(private_data == NULL ) {
private_data = wmem_new0(pinfo->pool, ranap_private_data_t);
p_add_proto_data(pinfo->pool, pinfo, proto_ranap, 0, private_data);
return private_data;
}
return private_data;
}
/* Helper function to reset the the private data struct */
@ -14956,7 +14953,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
/*--- End of included file: packet-ranap-fn.c ---*/
#line 198 "./asn1/ranap/packet-ranap-template.c"
#line 195 "./asn1/ranap/packet-ranap-template.c"
static int
dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
@ -18340,7 +18337,7 @@ void proto_register_ranap(void) {
NULL, HFILL }},
/*--- End of included file: packet-ranap-hfarr.c ---*/
#line 413 "./asn1/ranap/packet-ranap-template.c"
#line 410 "./asn1/ranap/packet-ranap-template.c"
};
/* List of subtrees */
@ -18704,7 +18701,7 @@ void proto_register_ranap(void) {
&ett_ranap_Outcome,
/*--- End of included file: packet-ranap-ettarr.c ---*/
#line 421 "./asn1/ranap/packet-ranap-template.c"
#line 418 "./asn1/ranap/packet-ranap-template.c"
};
@ -19131,7 +19128,7 @@ proto_reg_handoff_ranap(void)
/*--- End of included file: packet-ranap-dis-tab.c ---*/
#line 470 "./asn1/ranap/packet-ranap-template.c"
#line 467 "./asn1/ranap/packet-ranap-template.c"
} else {
dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
}