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

NGAP:n2InfoContainer is also used for datatype N2InfoContainer 

Change-Id: I966f74e9bb4f1155f4884f5e77fd87bae9d46a6b
Reviewed-on: https://code.wireshark.org/review/37581
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Anders Broman 2020-06-29 12:48:04 +02:00 committed by Pascal Quantin
parent bf30a1cbe7
commit 6ccae11c11
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/asn1/ngap/packet-ngap-template.c
View File

@ -476,6 +476,10 @@ dissect_ngap_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
if (json_parse(json_data, tokens, ret) < 0)
return 0;
cur_tok = json_get_object(json_data, tokens, "n2InfoContainer");
if (!cur_tok) {
/* look for n2Information too*/
cur_tok = json_get_object(json_data, tokens, "n2Information");
}
if (cur_tok) {
n2_info_class = json_get_string(json_data, cur_tok, "n2InformationClass");
if (!n2_info_class)

10
epan/dissectors/packet-ngap.c
View File

@ -14638,6 +14638,10 @@ dissect_ngap_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
if (json_parse(json_data, tokens, ret) < 0)
return 0;
cur_tok = json_get_object(json_data, tokens, "n2InfoContainer");
if (!cur_tok) {
/* look for n2Information too*/
cur_tok = json_get_object(json_data, tokens, "n2Information");
}
if (cur_tok) {
n2_info_class = json_get_string(json_data, cur_tok, "n2InformationClass");
if (!n2_info_class)
@ -15020,7 +15024,7 @@ proto_reg_handoff_ngap(void)
/*--- End of included file: packet-ngap-dis-tab.c ---*/
#line 578 "./asn1/ngap/packet-ngap-template.c"
#line 582 "./asn1/ngap/packet-ngap-template.c"
dissector_add_string("media_type", "application/vnd.3gpp.ngap", ngap_media_type_handle);
} else {
@ -18153,7 +18157,7 @@ void proto_register_ngap(void) {
"UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-ngap-hfarr.c ---*/
#line 726 "./asn1/ngap/packet-ngap-template.c"
#line 730 "./asn1/ngap/packet-ngap-template.c"
};
/* List of subtrees */
@ -18624,7 +18628,7 @@ void proto_register_ngap(void) {
&ett_ngap_UnsuccessfulOutcome,
/*--- End of included file: packet-ngap-ettarr.c ---*/
#line 757 "./asn1/ngap/packet-ngap-template.c"
#line 761 "./asn1/ngap/packet-ngap-template.c"
};
static ei_register_info ei[] = {