[S1AP] Update to version V13.1.0 (2015-12)

Change-Id: I48080dd6839d3cb02b6ea3717d69b56dbf3e59d8
Reviewed-on: https://code.wireshark.org/review/13077
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 115 insertions, 11 deletions

diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index ce549fb9b1..13fd489017 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -590,8 +590,8 @@ id-ErrorIndication						ProcedureCode
 id-NASNonDeliveryIndication				ProcedureCode
 id-S1Setup								ProcedureCode
 id-UEContextReleaseRequest				ProcedureCode
-id-DownlinkS1cdma2000tunneling			ProcedureCode
-id-UplinkS1cdma2000tunneling			ProcedureCode
+id-DownlinkS1cdma2000tunnelling			ProcedureCode
+id-UplinkS1cdma2000tunnelling			ProcedureCode
 id-UEContextModification				ProcedureCode
 id-UECapabilityInfoIndication			ProcedureCode
 id-UEContextRelease						ProcedureCode
@@ -621,6 +621,10 @@ id-downlinkNonUEAssociatedLPPaTransport	ProcedureCode
 id-uplinkNonUEAssociatedLPPaTransport	ProcedureCode
 id-UERadioCapabilityMatch				ProcedureCode
 id-PWSRestartIndication					ProcedureCode
+id-E-RABModificationIndication			ProcedureCode
+id-PWSFailureIndication					ProcedureCode
+id-RerouteNASRequest					ProcedureCode
+id-UEContextModificationIndication		ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
@@ -755,7 +759,7 @@ id-CellAccessMode									ProtocolIE-ID
 id-CSGMembershipStatus								ProtocolIE-ID
 id-LPPa-PDU											ProtocolIE-ID
 id-Routing-ID										ProtocolIE-ID
-id-Time-Synchronization-Info						ProtocolIE-ID
+id-Time-Synchronisation-Info						ProtocolIE-ID
 id-PS-ServiceNotAvailable							ProtocolIE-ID
 id-PagingPriority									ProtocolIE-ID
 id-x2TNLConfigurationInfo							ProtocolIE-ID
@@ -800,7 +804,34 @@ id-EmergencyAreaIDListForRestart					ProtocolIE-ID
 id-KillAllWarningMessages							ProtocolIE-ID
 id-Masked-IMEISV									ProtocolIE-ID
 id-eNBIndirectX2TransportLayerAddresses				ProtocolIE-ID
-
+id-uE-HistoryInformationFromTheUE					ProtocolIE-ID
+id-ProSeAuthorized									ProtocolIE-ID
+id-ExpectedUEBehaviour								ProtocolIE-ID
+id-LoggedMBSFNMDT									ProtocolIE-ID
+id-UERadioCapabilityForPaging						ProtocolIE-ID
+id-E-RABToBeModifiedListBearerModInd				ProtocolIE-ID
+id-E-RABToBeModifiedItemBearerModInd				ProtocolIE-ID
+id-E-RABNotToBeModifiedListBearerModInd				ProtocolIE-ID
+id-E-RABNotToBeModifiedItemBearerModInd				ProtocolIE-ID
+id-E-RABModifyListBearerModConf						ProtocolIE-ID
+id-E-RABModifyItemBearerModConf						ProtocolIE-ID
+id-E-RABFailedToModifyListBearerModConf				ProtocolIE-ID
+id-SON-Information-Report							ProtocolIE-ID
+id-Muting-Availability-Indication					ProtocolIE-ID
+id-Muting-Pattern-Information						ProtocolIE-ID
+id-Synchronisation-Information						ProtocolIE-ID
+id-E-RABToBeReleasedListBearerModConf				ProtocolIE-ID
+id-ProSeUEtoNetworkRelaying							ProtocolIE-ID
+id-ULCOUNTValuePDCP-SNlength18						ProtocolIE-ID
+id-DLCOUNTValuePDCP-SNlength18						ProtocolIE-ID
+id-ReceiveStatusOfULPDCPSDUsPDCP-SNlength18			ProtocolIE-ID
+id-M6Configuration									ProtocolIE-ID
+id-M7Configuration									ProtocolIE-ID
+id-PWSfailedECGIList								ProtocolIE-ID
+id-MME-Group-ID										ProtocolIE-ID
+id-Additional-GUTI									ProtocolIE-ID
+id-S1-Message										ProtocolIE-ID
+id-CSGMembershipInfo								ProtocolIE-ID
 #.END
 
 #.REGISTER
@@ -935,7 +966,6 @@ CSGMembershipStatus						N s1ap.ies id-CSGMembershipStatus
 LPPa-PDU								N s1ap.ies id-LPPa-PDU
 Routing-ID								N s1ap.ies id-Routing-ID
 PS-ServiceNotAvailable					N s1ap.ies id-PS-ServiceNotAvailable
-
 PagingPriority							N s1ap.ies id-PagingPriority
 GUMMEIList								N s1ap.ies id-GUMMEIList
 TransportLayerAddress					N s1ap.ies id-GW-TransportLayerAddress
@@ -960,6 +990,23 @@ TAIListForRestart						N s1ap.ies id-TAIListForRestart
 UserLocationInformation					N s1ap.ies id-UserLocationInformation
 KillAllWarningMessages					N s1ap.ies id-KillAllWarningMessages
 Masked-IMEISV							N s1ap.ies id-Masked-IMEISV
+ProSeAuthorized							N s1ap.ies id-ProSeAuthorized
+ExpectedUEBehaviour						N s1ap.ies id-ExpectedUEBehaviour
+UERadioCapabilityForPaging				N s1ap.ies id-UERadioCapabilityForPaging
+E-RABToBeModifiedListBearerModInd		N s1ap.ies id-E-RABToBeModifiedListBearerModInd
+E-RABToBeModifiedItemBearerModInd		N s1ap.ies id-E-RABToBeModifiedItemBearerModInd
+E-RABNotToBeModifiedListBearerModInd	N s1ap.ies id-E-RABNotToBeModifiedListBearerModInd
+E-RABNotToBeModifiedItemBearerModInd	N s1ap.ies id-E-RABNotToBeModifiedItemBearerModInd
+E-RABModifyListBearerModConf			N s1ap.ies id-E-RABModifyListBearerModConf
+E-RABModifyItemBearerModConf			N s1ap.ies id-E-RABModifyItemBearerModConf
+E-RABList								N s1ap.ies id-E-RABFailedToModifyListBearerModConf
+SONInformationReport					N s1ap.ies id-SON-Information-Report
+E-RABList								N s1ap.ies id-E-RABToBeReleasedListBearerModConf
+PWSfailedECGIList						N s1ap.ies id-PWSfailedECGIList
+MME-Group-ID							N s1ap.ies id-MME-Group-ID
+Additional-GUTI							N s1ap.ies id-Additional-GUTI
+#OCTET STRING							N s1ap.ies id-S1-Message
+CSGMembershipInfo						N s1ap.ies id-CSGMembershipInfo
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst				N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -969,7 +1016,7 @@ Masked-IMEISV							N s1ap.ies id-Masked-IMEISV
 #RAB-Parameters							N s1ap.extension id-AlternativeRABConfiguration
 #Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf N s1ap.extension id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf
 Data-Forwarding-Not-Possible			N s1ap.extension id-Data-Forwarding-Not-Possible
-TimeSynchronizationInfo					N s1ap.extension id-Time-Synchronization-Info
+TimeSynchronisationInfo					N s1ap.extension id-Time-Synchronisation-Info
 X2TNLConfigurationInfo					N s1ap.extension id-x2TNLConfigurationInfo
 ENBX2ExtTLAs							N s1ap.extension id-eNBX2ExtendedTransportLayerAddresses
 Correlation-ID							N s1ap.extension id-Correlation-ID
@@ -989,6 +1036,17 @@ Correlation-ID							N s1ap.extension id-SIPTO-Correlation-ID
 TransportInformation					N s1ap.extension id-TransportInformation
 EmergencyAreaIDListForRestart			N s1ap.extension id-EmergencyAreaIDListForRestart
 ENBIndirectX2TransportLayerAddresses	N s1ap.extension id-eNBIndirectX2TransportLayerAddresses
+LoggedMBSFNMDT							N s1ap.extension id-LoggedMBSFNMDT
+UE-HistoryInformationFromTheUE			N s1ap.extension id-uE-HistoryInformationFromTheUE
+MutingAvailabilityIndication			N s1ap.extension id-Muting-Availability-Indication
+MutingPatternInformation				N s1ap.extension id-Muting-Pattern-Information
+SynchronisationInformation				N s1ap.extension id-Synchronisation-Information
+ProSeUEtoNetworkRelaying				N s1ap.extension id-ProSeUEtoNetworkRelaying
+COUNTvaluePDCP-SNlength18				N s1ap.extension id-ULCOUNTValuePDCP-SNlength18
+COUNTvaluePDCP-SNlength18				N s1ap.extension id-DLCOUNTValuePDCP-SNlength18
+ReceiveStatusOfULPDCPSDUsPDCP-SNlength18	N s1ap.extension id-ReceiveStatusOfULPDCPSDUsPDCP-SNlength18
+M6Configuration							N s1ap.extension id-M6Configuration
+M7Configuration							N s1ap.extension id-M7Configuration
 
 #S1AP-ELEMENTARY-PROCEDURE
 HandoverRequired						N s1ap.proc.imsg id-HandoverPreparation
@@ -1044,7 +1102,7 @@ S1SetupRequest							N s1ap.proc.imsg id-S1Setup
 S1SetupResponse							N s1ap.proc.sout id-S1Setup
 S1SetupFailure							N s1ap.proc.uout id-S1Setup
 
-DownlinkS1cdma2000tunneling				N s1ap.proc.imsg id-DownlinkS1cdma2000tunneling
+DownlinkS1cdma2000tunnelling			N s1ap.proc.imsg id-DownlinkS1cdma2000tunnelling
 
 ENBConfigurationUpdate					N s1ap.proc.imsg id-ENBConfigurationUpdate
 ENBConfigurationUpdateAcknowledge		N s1ap.proc.sout id-ENBConfigurationUpdate
@@ -1054,7 +1112,7 @@ MMEConfigurationUpdate					N s1ap.proc.imsg id-MMEConfigurationUpdate
 MMEConfigurationUpdateAcknowledge		N s1ap.proc.sout id-MMEConfigurationUpdate
 MMEConfigurationUpdateFailure			N s1ap.proc.uout id-MMEConfigurationUpdate
 
-UplinkS1cdma2000tunneling				N s1ap.proc.imsg id-UplinkS1cdma2000tunneling
+UplinkS1cdma2000tunnelling				N s1ap.proc.imsg id-UplinkS1cdma2000tunnelling
 
 UEContextModificationRequest			N s1ap.proc.imsg id-UEContextModification
 UEContextModificationResponse			N s1ap.proc.sout id-UEContextModification
@@ -1092,14 +1150,16 @@ ENBDirectInformationTransfer			N s1ap.proc.imsg id-eNBDirectInformationTransfer
 
 MMEDirectInformationTransfer			N s1ap.proc.imsg id-MMEDirectInformationTransfer
 
-PrivateMessage							N s1ap.proc.imsg id-PrivateMessage
-
 ENBConfigurationTransfer				N s1ap.proc.imsg id-eNBConfigurationTransfer
 
 MMEConfigurationTransfer				N s1ap.proc.imsg id-MMEConfigurationTransfer
 
 CellTrafficTrace						N s1ap.proc.imsg id-CellTrafficTrace
 
+PrivateMessage							N s1ap.proc.imsg id-PrivateMessage
+
+PWSRestartIndication					N s1ap.proc.imsg id-PWSRestartIndication
+
 KillRequest								N s1ap.proc.imsg id-Kill
 KillResponse							N s1ap.proc.sout id-Kill
 
@@ -1114,7 +1174,15 @@ UplinkNonUEAssociatedLPPaTransport		N s1ap.proc.imsg id-uplinkNonUEAssociatedLPP
 UERadioCapabilityMatchRequest			N s1ap.proc.imsg id-UERadioCapabilityMatch
 UERadioCapabilityMatchResponse			N s1ap.proc.sout id-UERadioCapabilityMatch
 
-PWSRestartIndication					N s1ap.proc.imsg id-PWSRestartIndication
+E-RABModificationIndication				N s1ap.proc.imsg id-E-RABModificationIndication
+E-RABModificationConfirm				N s1ap.proc.sout id-E-RABModificationIndication
+
+UEContextModificationIndication			N s1ap.proc.imsg id-UEContextModificationIndication
+UEContextModificationConfirm			N s1ap.proc.sout id-UEContextModificationIndication
+
+RerouteNASRequest						N s1ap.proc.imsg id-RerouteNASRequest
+
+PWSFailureIndication					N s1ap.proc.imsg id-PWSFailureIndication
 
 #.FN_HDR E-RABSetupRequest
      col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupRequest ");
@@ -1210,6 +1278,42 @@ PWSRestartIndication					N s1ap.proc.imsg id-PWSRestartIndication
 #.FN_HDR KillResponse
      col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillResponse ");
 
+#.FN_HDR DownlinkUEAssociatedLPPaTransport
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkUEAssociatedLPPaTransport ");
+
+#.FN_HDR UplinkUEAssociatedLPPaTransport
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkUEAssociatedLPPaTransport ");
+
+#.FN_HDR DownlinkNonUEAssociatedLPPaTransport
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkNonUEAssociatedLPPaTransport ");
+
+#.FN_HDR UplinkNonUEAssociatedLPPaTransport
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkNonUEAssociatedLPPaTransport ");
+
+#.FN_HDR UERadioCapabilityMatchRequest
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchRequest ");
+
+#.FN_HDR UERadioCapabilityMatchResponse
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchResponse ");
+
+#.FN_HDR E-RABModificationIndication
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationIndication ");
+
+#.FN_HDR E-RABModificationConfirm
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationConfirm ");
+
+#.FN_HDR UEContextModificationIndication
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationIndication ");
+
+#.FN_HDR UEContextModificationConfirm
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationConfirm ");
+
+#.FN_HDR RerouteNASRequest
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", RerouteNASRequest ");
+
+#.FN_HDR PWSFailureIndication
+     col_append_str(actx->pinfo->cinfo, COL_INFO, ", PWSFailureIndication ");
+
 
 /* Whenever a Cause appears, look up the reason and show it in the Info column */