osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

X2AP : fix id-Target-SgNB-ID registered to wrong type

This commit is contained in:
Tom Yan 2020-09-23 03:39:34 +00:00 committed by Wireshark GitLab Utility
parent 103d9140ae
commit 6387fd7729
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/x2ap/x2ap.cnf
View File

@ -1689,7 +1689,7 @@ E-RABs-ToBeReleased-SgNBRelConfList N x2ap.ies id-E-RABs-ToBeReleased-SgNBRel
E-RABs-ToBeReleased-SgNBRelConf-Item N x2ap.ies id-E-RABs-ToBeReleased-SgNBRelConf-Item
E-RABs-SubjectToSgNBCounterCheck-List N x2ap.ies id-E-RABs-SubjectToSgNBCounterCheck-List
E-RABs-SubjectToSgNBCounterCheck-Item N x2ap.ies id-E-RABs-SubjectToSgNBCounterCheck-Item
GNB-ID N x2ap.ies id-Target-SgNB-ID
GlobalGNB-ID N x2ap.ies id-Target-SgNB-ID
HandoverRestrictionList N x2ap.ies id-HandoverRestrictionList
SCGConfigurationQuery N x2ap.ies id-SCGConfigurationQuery
SplitSRB N x2ap.ies id-SplitSRB

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

@ -726,7 +726,6 @@ static int hf_x2ap_GNBOverloadInformation_PDU = -1; /* GNBOverloadInformation *
static int hf_x2ap_GTPtunnelEndpoint_PDU = -1; /* GTPtunnelEndpoint */
static int hf_x2ap_GUGroupIDList_PDU = -1; /* GUGroupIDList */
static int hf_x2ap_GUMMEI_PDU = -1; /* GUMMEI */
static int hf_x2ap_GNB_ID_PDU = -1; /* GNB_ID */
static int hf_x2ap_HandoverReportType_PDU = -1; /* HandoverReportType */
static int hf_x2ap_HandoverRestrictionList_PDU = -1; /* HandoverRestrictionList */
static int hf_x2ap_IABInformation_PDU = -1; /* IABInformation */
@ -18611,14 +18610,6 @@ static int dissect_GUMMEI_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t
offset += 7; offset >>= 3;
return offset;
}
static int dissect_GNB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
offset = dissect_x2ap_GNB_ID(tvb, offset, &asn1_ctx, tree, hf_x2ap_GNB_ID_PDU);
offset += 7; offset >>= 3;
return offset;
}
static int dissect_HandoverReportType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
int offset = 0;
asn1_ctx_t asn1_ctx;
@ -22161,10 +22152,6 @@ void proto_register_x2ap(void) {
{ "GUMMEI", "x2ap.GUMMEI_element",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_x2ap_GNB_ID_PDU,
{ "GNB-ID", "x2ap.GNB_ID",
FT_UINT32, BASE_DEC, VALS(x2ap_GNB_ID_vals), 0,
NULL, HFILL }},
{ &hf_x2ap_HandoverReportType_PDU,
{ "HandoverReportType", "x2ap.HandoverReportType",
FT_UINT32, BASE_DEC, VALS(x2ap_HandoverReportType_vals), 0,
@ -27456,7 +27443,7 @@ proto_reg_handoff_x2ap(void)
dissector_add_uint("x2ap.ies", id_E_RABs_ToBeReleased_SgNBRelConf_Item, create_dissector_handle(dissect_E_RABs_ToBeReleased_SgNBRelConf_Item_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_E_RABs_SubjectToSgNBCounterCheck_List, create_dissector_handle(dissect_E_RABs_SubjectToSgNBCounterCheck_List_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_E_RABs_SubjectToSgNBCounterCheck_Item, create_dissector_handle(dissect_E_RABs_SubjectToSgNBCounterCheck_Item_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_Target_SgNB_ID, create_dissector_handle(dissect_GNB_ID_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_Target_SgNB_ID, create_dissector_handle(dissect_GlobalGNB_ID_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_HandoverRestrictionList, create_dissector_handle(dissect_HandoverRestrictionList_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_SCGConfigurationQuery, create_dissector_handle(dissect_SCGConfigurationQuery_PDU, proto_x2ap));
dissector_add_uint("x2ap.ies", id_SplitSRB, create_dissector_handle(dissect_SplitSRB_PDU, proto_x2ap));