diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-28 22:53:36 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-06-29 00:42:21 +0000 |
commit | d4c8b27d13abf5f5438ca3bc6b73b618ed7ca150 (patch) | |
tree | e4e2931cf80e2bdf8064e5d76e9a5cb827495775 /epan/dissectors/asn1 | |
parent | 7460e6c9ec3046aa66a413e6710e0d0c3fcbbf69 (diff) |
S1AP: upgrade dissector to v13.6.0
Change-Id: Ic75bd30ae77053241bebeb47e9b3e10529a8d0f7
Reviewed-on: https://code.wireshark.org/review/22451
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-Constants.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-Containers.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-IEs.asn | 11 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn | 15 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn | 2 | ||||
-rw-r--r-- | epan/dissectors/asn1/s1ap/packet-s1ap-template.c | 2 |
8 files changed, 21 insertions, 17 deletions
diff --git a/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn b/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn index 5803fd50df..466cf9004d 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 9.3.5 Common Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-Constants.asn b/epan/dissectors/asn1/s1ap/S1AP-Constants.asn index f29c4babc5..ed1f92d9b5 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 9.3.6 Constant Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-Containers.asn b/epan/dissectors/asn1/s1ap/S1AP-Containers.asn index 57176cd7f6..82d842c4e7 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 9.3.7 Container Definitions -- ************************************************************** -- diff --git a/epan/dissectors/asn1/s1ap/S1AP-IEs.asn b/epan/dissectors/asn1/s1ap/S1AP-IEs.asn index f7841ea30b..90cacfef05 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 9.3.4 Information Element Definitions -- ************************************************************** -- @@ -1107,7 +1107,7 @@ M5period ::= ENUMERATED {ms1024, ms2048, ms5120, ms10240, min1, ... } M6Configuration ::= SEQUENCE { m6report-Interval M6report-Interval, m6delay-threshold M6delay-threshold OPTIONAL, --- This IE shall be present if the M6 Links to log IE is set to �uplink� or to �both-uplink-and-downlink� -- +-- This IE shall be present if the M6 Links to log IE is set to "uplink" or to "both-uplink-and-downlink" -- m6-links-to-log Links-to-log, iE-Extensions ProtocolExtensionContainer { { M6Configuration-ExtIEs} } OPTIONAL, ... @@ -1295,7 +1295,8 @@ OverloadAction ::= ENUMERATED { permit-emergency-sessions-and-mobile-terminated-services-only, ..., permit-high-priority-sessions-and-mobile-terminated-services-only, - reject-delay-tolerant-access + reject-delay-tolerant-access, + permit-high-priority-sessions-and-exception-reporting-and-mobile-terminated-services-only } OverloadResponse ::= CHOICE { @@ -1655,10 +1656,10 @@ SONConfigurationTransfer ::= SEQUENCE { SONConfigurationTransfer-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { -- Extension for Release 10 to transfer the IP addresses of the eNB initiating the ANR action -- {ID id-x2TNLConfigurationInfo CRITICALITY ignore EXTENSION X2TNLConfigurationInfo PRESENCE conditional - -- This IE shall be present if the SON Information IE contains the SON Information Request IE and the SON Information Request IE is set to �X2TNL Configuration Info� --}| + -- This IE shall be present if the SON Information IE contains the SON Information Request IE and the SON Information Request IE is set to "X2TNL Configuration Info" --}| -- Extension for Release 12 to transfer information concerning the source cell of synchronisation and the aggressor cell -- {ID id-Synchronisation-Information CRITICALITY ignore EXTENSION SynchronisationInformation PRESENCE conditional - -- This IE shall be present if the SON Information IE contains the SON Information Request IE set to � Activate Muting � --}, + -- This IE shall be present if the SON Information IE contains the SON Information Request IE set to " Activate Muting " --}, ... } diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn index 69d7ec48f3..8546b77131 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 9.3.3 PDU Definitions -- ************************************************************** -- @@ -705,7 +705,8 @@ PathSwitchRequestIEs S1AP-PROTOCOL-IES ::= { { ID id-CSGMembershipStatus CRITICALITY ignore TYPE CSGMembershipStatus PRESENCE optional}| -- Extension for Release 11 to support BBAI -- { ID id-Tunnel-Information-for-BBF CRITICALITY ignore TYPE TunnelInformation PRESENCE optional}| - { ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}, + { ID id-LHN-ID CRITICALITY ignore TYPE LHN-ID PRESENCE optional}| + { ID id-RRC-Resume-Cause CRITICALITY ignore TYPE RRC-Establishment-Cause PRESENCE optional }, ... } @@ -1275,7 +1276,7 @@ PagingIEs S1AP-PROTOCOL-IES ::= { { ID id-CSG-IdList CRITICALITY ignore TYPE CSG-IdList PRESENCE optional}| { ID id-PagingPriority CRITICALITY ignore TYPE PagingPriority PRESENCE optional}| { ID id-UERadioCapabilityForPaging CRITICALITY ignore TYPE UERadioCapabilityForPaging PRESENCE optional}| --- Extension for Release 13 to support Paging Optimisation and Coverage Enhancement paging �- +-- Extension for Release 13 to support Paging Optimisation and Coverage Enhancement paging -- { ID id-AssistanceDataForPaging CRITICALITY ignore TYPE AssistanceDataForPaging PRESENCE optional}| { ID id-Paging-eDRXInformation CRITICALITY ignore TYPE Paging-eDRXInformation PRESENCE optional}| { ID id-extended-UEIdentityIndexValue CRITICALITY ignore TYPE Extended-UEIdentityIndexValue PRESENCE optional}| @@ -1363,7 +1364,7 @@ UEContextReleaseComplete-IEs S1AP-PROTOCOL-IES ::= { { ID id-UserLocationInformation CRITICALITY ignore TYPE UserLocationInformation PRESENCE optional}| -- Extension for Release 13 to support Paging Optimisation { ID id-InformationOnRecommendedCellsAndENBsForPaging CRITICALITY ignore TYPE InformationOnRecommendedCellsAndENBsForPaging PRESENCE optional}| --- Extension for Release 13 to support coverage enhancement paging � +-- Extension for Release 13 to support coverage enhancement paging - { ID id-CellIdentifierAndCELevelForCECapableUEs CRITICALITY ignore TYPE CellIdentifierAndCELevelForCECapableUEs PRESENCE optional}, ... } @@ -2754,7 +2755,8 @@ UEContextSuspendResponse ::= SEQUENCE { UEContextSuspendResponseIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}| + { ID id-SecurityContext CRITICALITY reject TYPE SecurityContext PRESENCE optional}, ... } @@ -2816,7 +2818,8 @@ UEContextResumeResponseIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY ignore TYPE MME-UE-S1AP-ID PRESENCE mandatory}| { ID id-eNB-UE-S1AP-ID CRITICALITY ignore TYPE ENB-UE-S1AP-ID PRESENCE mandatory}| { ID id-E-RABFailedToResumeListResumeRes CRITICALITY reject TYPE E-RABFailedToResumeListResumeRes PRESENCE optional}| - { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}, + { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional}| + { ID id-SecurityContext CRITICALITY reject TYPE SecurityContext PRESENCE optional}, ... } diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn index bf4a4d6c4d..592ceaf56f 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 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 83b016ab8c..babcc0b941 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 V13.5.0 (2016-12) +-- 3GPP TS 36.413 V13.6.0 (2017-06) -- 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 3fc39d3dea..7a495bddb9 100644 --- a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c +++ b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c @@ -22,7 +22,7 @@ * * Based on the RANAP dissector * - * References: 3GPP TS 36.413 V13.5.0 (2016-12) + * References: 3GPP TS 36.413 V13.6.0 (2017-06) */ #include "config.h" |