diff --git a/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn b/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn index 6f03db3c0f..298eaa99a7 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- 9.3.5 Common Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-Constants.asn b/epan/dissectors/asn1/s1ap/S1AP-Constants.asn index 3e111932e8..f7682275f4 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-Constants.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-Constants.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- 9.3.6 Constant Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-Containers.asn b/epan/dissectors/asn1/s1ap/S1AP-Containers.asn index 9b53fe64cf..1bb102a08a 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-Containers.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-Containers.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- 9.3.7 Container Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-IEs.asn b/epan/dissectors/asn1/s1ap/S1AP-IEs.asn index ab6c5a8aa0..2f83e6ecd6 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-IEs.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- 9.3.4 Information Element Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn index f781fd7ad0..29a4dd2211 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- 9.3.3 PDU Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn index f3956daa01..132e71bd3d 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- 9.3.2 Elementary Procedure Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn b/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn index 73d734feb7..12b8486dae 100644 --- a/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn +++ b/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.413 V17.5.0 (2023-06) +-- 3GPP TS 36.413 V17.6.0 (2024-03) -- B.2 ASN.1 definition -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c index 0c810a63a5..4eaeacddf9 100644 --- a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c +++ b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c @@ -10,7 +10,7 @@ * * Based on the RANAP dissector * - * References: 3GPP TS 36.413 V17.5.0 (2023-06) + * References: 3GPP TS 36.413 V17.6.0 (2024-03) */ #include "config.h" @@ -121,7 +121,10 @@ static int hf_s1ap_rAT_RestrictionInformation_LEO; static int hf_s1ap_rAT_RestrictionInformation_MEO; static int hf_s1ap_rAT_RestrictionInformation_GEO; static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT; -static int hf_s1ap_rAT_RestrictionInformation_Reserved; +static int hf_s1ap_rAT_RestrictionInformation_NR_LEO; +static int hf_s1ap_rAT_RestrictionInformation_NR_MEO; +static int hf_s1ap_rAT_RestrictionInformation_NR_GEO; +static int hf_s1ap_rAT_RestrictionInformation_NR_OTHERSAT; #include "packet-s1ap-hf.c" /* Initialize the subtree pointers */ @@ -733,9 +736,21 @@ void proto_register_s1ap(void) { { "OTHERSAT", "s1ap.rAT_RestrictionInformation.OTHERSAT", FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10, NULL, HFILL }}, - { &hf_s1ap_rAT_RestrictionInformation_Reserved, - { "Reserved", "s1ap.rAT_RestrictionInformation.Reserved", - FT_UINT8, BASE_HEX, NULL, 0x0f, + { &hf_s1ap_rAT_RestrictionInformation_NR_LEO, + { "NR-LEO", "s1ap.rAT_RestrictionInformation.NR_LEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x08, + NULL, HFILL }}, + { &hf_s1ap_rAT_RestrictionInformation_NR_MEO, + { "NR-MEO", "s1ap.rAT_RestrictionInformation.NR_MEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x04, + NULL, HFILL }}, + { &hf_s1ap_rAT_RestrictionInformation_NR_GEO, + { "NR-GEO", "s1ap.rAT_RestrictionInformation.NR_GEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x02, + NULL, HFILL }}, + { &hf_s1ap_rAT_RestrictionInformation_NR_OTHERSAT, + { "NR-OTHERSAT", "s1ap.rAT_RestrictionInformation.NR_OTHERSAT", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x01, NULL, HFILL }}, #include "packet-s1ap-hfarr.c" }; diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf index 61cde3a23a..322d3888a9 100644 --- a/epan/dissectors/asn1/s1ap/s1ap.cnf +++ b/epan/dissectors/asn1/s1ap/s1ap.cnf @@ -722,7 +722,10 @@ Hysteresis DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Hysteresis_fmt) &hf_s1ap_rAT_RestrictionInformation_MEO, &hf_s1ap_rAT_RestrictionInformation_GEO, &hf_s1ap_rAT_RestrictionInformation_OTHERSAT, - &hf_s1ap_rAT_RestrictionInformation_Reserved, + &hf_s1ap_rAT_RestrictionInformation_NR_LEO, + &hf_s1ap_rAT_RestrictionInformation_NR_MEO, + &hf_s1ap_rAT_RestrictionInformation_NR_GEO, + &hf_s1ap_rAT_RestrictionInformation_NR_OTHERSAT, NULL }; proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_rAT_RestrictionInformation); diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 755a59c09f..25214a0d8e 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -15,7 +15,7 @@ * * Based on the RANAP dissector * - * References: 3GPP TS 36.413 V17.5.0 (2023-06) + * References: 3GPP TS 36.413 V17.6.0 (2024-03) */ #include "config.h" @@ -627,7 +627,10 @@ static int hf_s1ap_rAT_RestrictionInformation_LEO; static int hf_s1ap_rAT_RestrictionInformation_MEO; static int hf_s1ap_rAT_RestrictionInformation_GEO; static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT; -static int hf_s1ap_rAT_RestrictionInformation_Reserved; +static int hf_s1ap_rAT_RestrictionInformation_NR_LEO; +static int hf_s1ap_rAT_RestrictionInformation_NR_MEO; +static int hf_s1ap_rAT_RestrictionInformation_NR_GEO; +static int hf_s1ap_rAT_RestrictionInformation_NR_OTHERSAT; static int hf_s1ap_Additional_GUTI_PDU; /* Additional_GUTI */ static int hf_s1ap_AdditionalRRMPriorityIndex_PDU; /* AdditionalRRMPriorityIndex */ static int hf_s1ap_AerialUEsubscriptionInformation_PDU; /* AerialUEsubscriptionInformation */ @@ -9621,7 +9624,10 @@ dissect_s1ap_T_rAT_RestrictionInformation(tvbuff_t *tvb _U_, int offset _U_, asn &hf_s1ap_rAT_RestrictionInformation_MEO, &hf_s1ap_rAT_RestrictionInformation_GEO, &hf_s1ap_rAT_RestrictionInformation_OTHERSAT, - &hf_s1ap_rAT_RestrictionInformation_Reserved, + &hf_s1ap_rAT_RestrictionInformation_NR_LEO, + &hf_s1ap_rAT_RestrictionInformation_NR_MEO, + &hf_s1ap_rAT_RestrictionInformation_NR_GEO, + &hf_s1ap_rAT_RestrictionInformation_NR_OTHERSAT, NULL }; proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_rAT_RestrictionInformation); @@ -18874,9 +18880,21 @@ void proto_register_s1ap(void) { { "OTHERSAT", "s1ap.rAT_RestrictionInformation.OTHERSAT", FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10, NULL, HFILL }}, - { &hf_s1ap_rAT_RestrictionInformation_Reserved, - { "Reserved", "s1ap.rAT_RestrictionInformation.Reserved", - FT_UINT8, BASE_HEX, NULL, 0x0f, + { &hf_s1ap_rAT_RestrictionInformation_NR_LEO, + { "NR-LEO", "s1ap.rAT_RestrictionInformation.NR_LEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x08, + NULL, HFILL }}, + { &hf_s1ap_rAT_RestrictionInformation_NR_MEO, + { "NR-MEO", "s1ap.rAT_RestrictionInformation.NR_MEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x04, + NULL, HFILL }}, + { &hf_s1ap_rAT_RestrictionInformation_NR_GEO, + { "NR-GEO", "s1ap.rAT_RestrictionInformation.NR_GEO", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x02, + NULL, HFILL }}, + { &hf_s1ap_rAT_RestrictionInformation_NR_OTHERSAT, + { "NR-OTHERSAT", "s1ap.rAT_RestrictionInformation.NR_OTHERSAT", + FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x01, NULL, HFILL }}, { &hf_s1ap_Additional_GUTI_PDU, { "Additional-GUTI", "s1ap.Additional_GUTI_element",