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

S1AP: Wrong ie id used on RequestTypeAdditionalInfo

This commit is contained in:
AndersBroman 2022-11-28 09:34:15 +01:00
parent 60168c1c70
commit 47a1b0f9da
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/asn1/s1ap/s1ap.cnf
View File

@ -2257,7 +2257,7 @@ NRrestrictionin5GS N s1ap.extension id-NRrestrictionin5GS
PLMNidentity N s1ap.extension id-LastNG-RANPLMNIdentity
PSCellInformation N s1ap.extension id-PSCellInformation
IMSvoiceEPSfallbackfrom5G N s1ap.extension id-IMSvoiceEPSfallbackfrom5G
RequestTypeAdditionalInfo N s1ap.extension id-TimeSinceSecondaryNodeRelease
RequestTypeAdditionalInfo N s1ap.extension id-RequestTypeAdditionalInfo
ContextatSource N s1ap.extension id-ContextatSource
Ethernet-Type N s1ap.extension id-Ethernet-Type
IntersystemMeasurementConfiguration N s1ap.extension id-IntersystemMeasurementConfiguration
@ -2686,13 +2686,13 @@ MMEEarlyStatusTransfer N s1ap.proc.imsg id-MMEEarlyStatusTransf
%(DEFAULT_BODY)s
#.FIELD_ATTR
EUTRAN-CGI/cell-ID ABBREV=CellIdentity TYPE=FT_UINT32 DISPLAY=BASE_HEX BITMASK=0xFFFFFFF0
EUTRAN-CGI/cell-ID ABBREV=CellIdentity TYPE=FT_UINT32 DISPLAY=BASE_HEX
#.FN_BODY CellIdentity VAL_PTR = &cell_id_tvb HF_INDEX=-1
tvbuff_t *cell_id_tvb = NULL;
%(DEFAULT_BODY)s
if (cell_id_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, cell_id_tvb, 0, 4, ENC_BIG_ENDIAN);
guint32 cell_id = tvb_get_bits32(cell_id_tvb, 0, 28, ENC_BIG_ENDIAN);
actx->created_item = proto_tree_add_uint(tree, hf_index, cell_id_tvb, 0, 4, cell_id);
}
#.END

9
epan/dissectors/packet-s1ap.c
View File

@ -3150,13 +3150,14 @@ dissect_s1ap_AerialUEsubscriptionInformation(tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_s1ap_CellIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 2692 "./asn1/s1ap/s1ap.cnf"
#line 2691 "./asn1/s1ap/s1ap.cnf"
tvbuff_t *cell_id_tvb = NULL;
offset = dissect_per_bit_string(tvb, offset, actx, tree, -1,
28, 28, FALSE, NULL, 0, &cell_id_tvb, NULL);
if (cell_id_tvb) {
actx->created_item = proto_tree_add_item(tree, hf_index, cell_id_tvb, 0, 4, ENC_BIG_ENDIAN);
guint32 cell_id = tvb_get_bits32(cell_id_tvb, 0, 28, ENC_BIG_ENDIAN);
actx->created_item = proto_tree_add_uint(tree, hf_index, cell_id_tvb, 0, 4, cell_id);
}
@ -18951,7 +18952,7 @@ proto_reg_handoff_s1ap(void)
dissector_add_uint("s1ap.extension", id_LastNG_RANPLMNIdentity, create_dissector_handle(dissect_PLMNidentity_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_PSCellInformation, create_dissector_handle(dissect_s1ap_PSCellInformation_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_IMSvoiceEPSfallbackfrom5G, create_dissector_handle(dissect_IMSvoiceEPSfallbackfrom5G_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_TimeSinceSecondaryNodeRelease, create_dissector_handle(dissect_RequestTypeAdditionalInfo_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_RequestTypeAdditionalInfo, create_dissector_handle(dissect_RequestTypeAdditionalInfo_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_ContextatSource, create_dissector_handle(dissect_ContextatSource_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_Ethernet_Type, create_dissector_handle(dissect_Ethernet_Type_PDU, proto_s1ap));
dissector_add_uint("s1ap.extension", id_IntersystemMeasurementConfiguration, create_dissector_handle(dissect_IntersystemMeasurementConfiguration_PDU, proto_s1ap));
@ -21493,7 +21494,7 @@ void proto_register_s1ap(void) {
"INTEGER_0_18446744073709551615", HFILL }},
{ &hf_s1ap_cell_ID,
{ "cell-ID", "s1ap.CellIdentity",
FT_UINT32, BASE_HEX, NULL, 0xFFFFFFF0,
FT_UINT32, BASE_HEX, NULL, 0,
"CellIdentity", HFILL }},
{ &hf_s1ap_l1Threshold,
{ "l1Threshold", "s1ap.l1Threshold",