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

S1AP: upgrade dissector to v17.6.0

This commit is contained in:
Pascal Quantin 2024-04-04 11:57:12 +02:00
parent 668e6c6f79
commit 8b2d15115b
10 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn
View File

@ -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 -- 9.3.5 Common Definitions
-- ************************************************************** -- **************************************************************
-- --

2
epan/dissectors/asn1/s1ap/S1AP-Constants.asn
View File

@ -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 -- 9.3.6 Constant Definitions
-- ************************************************************** -- **************************************************************
-- --

2
epan/dissectors/asn1/s1ap/S1AP-Containers.asn
View File

@ -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 -- 9.3.7 Container Definitions
-- ************************************************************** -- **************************************************************
-- --

2
epan/dissectors/asn1/s1ap/S1AP-IEs.asn
View File

@ -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 -- 9.3.4 Information Element Definitions
-- ************************************************************** -- **************************************************************
-- --

2
epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn
View File

@ -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 -- 9.3.3 PDU Definitions
-- ************************************************************** -- **************************************************************
-- --

2
epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn
View File

@ -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 -- 9.3.2 Elementary Procedure Definitions
-- ************************************************************** -- **************************************************************
-- --

2
epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn
View File

@ -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 -- B.2 ASN.1 definition
-- ************************************************************** -- **************************************************************
-- --

25
epan/dissectors/asn1/s1ap/packet-s1ap-template.c
View File

@ -10,7 +10,7 @@
* *
* Based on the RANAP dissector * 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" #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_MEO;
static int hf_s1ap_rAT_RestrictionInformation_GEO; static int hf_s1ap_rAT_RestrictionInformation_GEO;
static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT; 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" #include "packet-s1ap-hf.c"
/* Initialize the subtree pointers */ /* Initialize the subtree pointers */
@ -733,9 +736,21 @@ void proto_register_s1ap(void) {
{ "OTHERSAT", "s1ap.rAT_RestrictionInformation.OTHERSAT", { "OTHERSAT", "s1ap.rAT_RestrictionInformation.OTHERSAT",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10, FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_Reserved, { &hf_s1ap_rAT_RestrictionInformation_NR_LEO,
{ "Reserved", "s1ap.rAT_RestrictionInformation.Reserved", { "NR-LEO", "s1ap.rAT_RestrictionInformation.NR_LEO",
FT_UINT8, BASE_HEX, NULL, 0x0f, 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 }}, NULL, HFILL }},
#include "packet-s1ap-hfarr.c" #include "packet-s1ap-hfarr.c"
}; };

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

@ -722,7 +722,10 @@ Hysteresis DISPLAY = BASE_CUSTOM STRINGS = CF_FUNC(s1ap_Hysteresis_fmt)
&hf_s1ap_rAT_RestrictionInformation_MEO, &hf_s1ap_rAT_RestrictionInformation_MEO,
&hf_s1ap_rAT_RestrictionInformation_GEO, &hf_s1ap_rAT_RestrictionInformation_GEO,
&hf_s1ap_rAT_RestrictionInformation_OTHERSAT, &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 NULL
}; };
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_rAT_RestrictionInformation); proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_rAT_RestrictionInformation);

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

@ -15,7 +15,7 @@
* *
* Based on the RANAP dissector * 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" #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_MEO;
static int hf_s1ap_rAT_RestrictionInformation_GEO; static int hf_s1ap_rAT_RestrictionInformation_GEO;
static int hf_s1ap_rAT_RestrictionInformation_OTHERSAT; 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_Additional_GUTI_PDU; /* Additional_GUTI */
static int hf_s1ap_AdditionalRRMPriorityIndex_PDU; /* AdditionalRRMPriorityIndex */ static int hf_s1ap_AdditionalRRMPriorityIndex_PDU; /* AdditionalRRMPriorityIndex */
static int hf_s1ap_AerialUEsubscriptionInformation_PDU; /* AerialUEsubscriptionInformation */ 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_MEO,
&hf_s1ap_rAT_RestrictionInformation_GEO, &hf_s1ap_rAT_RestrictionInformation_GEO,
&hf_s1ap_rAT_RestrictionInformation_OTHERSAT, &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 NULL
}; };
proto_tree *subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_rAT_RestrictionInformation); 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", { "OTHERSAT", "s1ap.rAT_RestrictionInformation.OTHERSAT",
FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10, FT_BOOLEAN, 8, TFS(&tfs_restricted_not_restricted), 0x10,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_s1ap_rAT_RestrictionInformation_Reserved, { &hf_s1ap_rAT_RestrictionInformation_NR_LEO,
{ "Reserved", "s1ap.rAT_RestrictionInformation.Reserved", { "NR-LEO", "s1ap.rAT_RestrictionInformation.NR_LEO",
FT_UINT8, BASE_HEX, NULL, 0x0f, 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 }}, NULL, HFILL }},
{ &hf_s1ap_Additional_GUTI_PDU, { &hf_s1ap_Additional_GUTI_PDU,
{ "Additional-GUTI", "s1ap.Additional_GUTI_element", { "Additional-GUTI", "s1ap.Additional_GUTI_element",