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

S1AP: upgrade dissector to v15.4.0 

Change-Id: Iecf02ce3858cd2cea12bc73e402ace0c558d8abc
Reviewed-on: https://code.wireshark.org/review/31444
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2019-01-08 15:07:32 +01:00
parent 95c72ece61
commit e0d6041bcf
10 changed files with 43 additions and 41 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 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- 9.3.5 Common Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- 9.3.6 Constant Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- 9.3.7 Container Definitions
-- **************************************************************
--

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- 9.3.4 Information Element Definitions
-- **************************************************************
--
@ -1116,9 +1116,10 @@ HandoverType ::= ENUMERATED {
ltetoutran,
ltetogeran,
utrantolte,
gerantolte, ...,
ltetonr,
nrtolte
gerantolte,
...,
eps-to-5gs,
fivegs-to-eps
}
HFN ::= INTEGER (0..1048575)

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- 9.3.3 PDU Definitions
-- **************************************************************
--
@ -3045,7 +3045,8 @@ UEInformationTransferIEs S1AP-PROTOCOL-IES ::= {
{ ID id-S-TMSI CRITICALITY reject TYPE S-TMSI PRESENCE mandatory}|
{ ID id-UE-Level-QoS-Parameters CRITICALITY ignore TYPE E-RABLevelQoSParameters PRESENCE optional}|
{ ID id-UERadioCapability CRITICALITY ignore TYPE UERadioCapability PRESENCE optional}|
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional},
{ ID id-Subscription-Based-UE-DifferentiationInfo CRITICALITY ignore TYPE Subscription-Based-UE-DifferentiationInfo PRESENCE optional}|
{ ID id-PendingDataIndication CRITICALITY ignore TYPE PendingDataIndication PRESENCE optional},
...
}

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

@ -1,4 +1,4 @@
-- 3GPP TS 36.413 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- 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 V15.3.0 (2018-09)
-- 3GPP TS 36.413 V15.4.0 (2018-12)
-- B.2 ASN.1 definition
-- **************************************************************
--

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

@ -10,7 +10,7 @@
*
* Based on the RANAP dissector
*
* References: 3GPP TS 36.413 V15.3.0 (2018-09)
* References: 3GPP TS 36.413 V15.4.0 (2018-12)
*/
#include "config.h"

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

@ -389,8 +389,8 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
utrantolte,
gerantolte,
...
ltetonr,
nrtolte
eps_to_5gs,
fivegs_to_eps
} */
case intralte:
/* intralte
@ -419,12 +419,12 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
case gerantolte:
/* gerantolte */
break;
case ltetonr:
/* ltetonr */
case eps_to_5gs:
/* eps_to_5gs */
dissect_ngap_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case nrtolte:
/* nrtolte */
case fivegs_to_eps:
/* fivegs_to_eps */
break;
default:
break;
@ -454,8 +454,8 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
utrantolte,
gerantolte,
...
ltetonr,
nrtolte
eps_to_5gs,
fivegs_to_eps
} */
case intralte:
/* intralte
@ -484,12 +484,12 @@ Port-Number TYPE = FT_UINT16 DISPLAY = BASE_DEC
case gerantolte:
/* gerantolte */
break;
case ltetonr:
/* ltetonr */
case eps_to_5gs:
/* eps_to_5gs */
dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case nrtolte:
/* nrtolte */
case fivegs_to_eps:
/* fivegs_to_eps */
break;
default:
break;

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

@ -18,7 +18,7 @@
*
* Based on the RANAP dissector
*
* References: 3GPP TS 36.413 V15.3.0 (2018-09)
* References: 3GPP TS 36.413 V15.4.0 (2018-12)
*/
#include "config.h"
@ -482,8 +482,8 @@ typedef enum _HandoverType_enum {
ltetogeran = 2,
utrantolte = 3,
gerantolte = 4,
ltetonr = 5,
nrtolte = 6
eps_to_5gs = 5,
fivegs_to_eps = 6
} HandoverType_enum;
typedef enum _RAT_Type_enum {
@ -5848,8 +5848,8 @@ static const value_string s1ap_HandoverType_vals[] = {
{ ltetogeran, "ltetogeran" },
{ utrantolte, "utrantolte" },
{ gerantolte, "gerantolte" },
{ ltetonr, "ltetonr" },
{ nrtolte, "nrtolte" },
{ eps_to_5gs, "eps-to-5gs" },
{ fivegs_to_eps, "fivegs-to-eps" },
{ 0, NULL }
};
@ -8341,8 +8341,8 @@ dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset
utrantolte,
gerantolte,
...
ltetonr,
nrtolte
eps_to_5gs,
fivegs_to_eps
} */
case intralte:
/* intralte
@ -8371,12 +8371,12 @@ dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset
case gerantolte:
/* gerantolte */
break;
case ltetonr:
/* ltetonr */
case eps_to_5gs:
/* eps_to_5gs */
dissect_ngap_SourceNGRANNode_ToTargetNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case nrtolte:
/* nrtolte */
case fivegs_to_eps:
/* fivegs_to_eps */
break;
default:
break;
@ -8976,8 +8976,8 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset
utrantolte,
gerantolte,
...
ltetonr,
nrtolte
eps_to_5gs,
fivegs_to_eps
} */
case intralte:
/* intralte
@ -9006,12 +9006,12 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset
case gerantolte:
/* gerantolte */
break;
case ltetonr:
/* ltetonr */
case eps_to_5gs:
/* eps_to_5gs */
dissect_ngap_TargetNGRANNode_ToSourceNGRANNode_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree, NULL);
break;
case nrtolte:
/* nrtolte */
case fivegs_to_eps:
/* fivegs_to_eps */
break;
default:
break;