diff options
25 files changed, 268 insertions, 145 deletions
diff --git a/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn b/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn index d03782ef97..5750dba133 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn @@ -1,6 +1,6 @@ --17.3.3 ASN.1 Module for application-context-names --The following ASN.1 module summarises the application-context-name assigned to MAP application-contexts. --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) MAP-ApplicationContexts { itu-t identified-organization (4) etsi (0) mobileDomain (0) diff --git a/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn index 87d8f2352f..3e08c1f185 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.10 Bearer Service Codes MAP-BS-Code { diff --git a/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn index 6cb77820f3..22a64aa244 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.3 Call handling data types MAP-CH-DataTypes { @@ -110,7 +110,7 @@ SendRoutingInfoArg ::= SEQUENCE { basicServiceGroup [9] Ext-BasicServiceCode OPTIONAL, networkSignalInfo [10] ExternalSignalInfo OPTIONAL, camelInfo [11] CamelInfo OPTIONAL, - suppressionOfAnnouncement [12] SuppressionOfAnnouncement OPTIONAL, + suppressionOfAnnouncement [12] SuppressionOfAnnouncement OPTIONAL, extensionContainer [13] ExtensionContainer OPTIONAL, ..., alertingPattern [14] AlertingPattern OPTIONAL, @@ -285,7 +285,7 @@ ResumeCallHandlingArg ::= SEQUENCE { allInformationSent [11] NULL OPTIONAL, ..., d-csi [12] D-CSI OPTIONAL, - o-BcsmCamelTDPCriteriaList [13] O-BcsmCamelTDPCriteriaList OPTIONAL, + o-BcsmCamelTDPCriteriaList [13] O-BcsmCamelTDPCriteriaList OPTIONAL, basicServiceGroup2 [14] Ext-BasicServiceCode OPTIONAL, mtRoamingRetry [15] NULL OPTIONAL } @@ -349,13 +349,13 @@ ReportingState ::= ENUMERATED { -- reception of values > 10 shall be mapped to 'startMonitoring' SetReportingStateRes ::= SEQUENCE{ - ccbs-SubscriberStatus [0] CCBS-SubscriberStatus OPTIONAL, + ccbs-SubscriberStatus [0] CCBS-SubscriberStatus OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ...} CCBS-SubscriberStatus ::= ENUMERATED { - ccbsNotIdle (0), - ccbsIdle (1), + ccbsNotIdle (0), + ccbsIdle (1), ccbsNotReachable (2), ...} -- exception handling: @@ -364,7 +364,7 @@ CCBS-SubscriberStatus ::= ENUMERATED { -- reception of values > 20 shall be mapped to 'ccbsNotReachable' StatusReportArg ::= SEQUENCE{ - imsi [0] IMSI, + imsi [0] IMSI, eventReportData [1] EventReportData OPTIONAL, callReportdata [2] CallReportData OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, @@ -408,7 +408,7 @@ RemoteUserFreeArg ::= SEQUENCE{ callInfo [1] ExternalSignalInfo, ccbs-Feature [2] CCBS-Feature, translatedB-Number [3] ISDN-AddressString, - replaceB-Number [4] NULL OPTIONAL, + replaceB-Number [4] NULL OPTIONAL, alertingPattern [5] AlertingPattern OPTIONAL, extensionContainer [6] ExtensionContainer OPTIONAL, ...} @@ -440,7 +440,7 @@ IST-AlertArg ::= SEQUENCE{ ...} IST-AlertRes ::= SEQUENCE{ - istAlertTimer [0] IST-AlertTimerValue OPTIONAL, + istAlertTimer [0] IST-AlertTimerValue OPTIONAL, istInformationWithdraw [1] NULL OPTIONAL, callTerminationIndicator [2] CallTerminationIndicator OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, diff --git a/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn index ee2553ac70..af66f805b5 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) --17.6.3 Call Handling Operations MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) diff --git a/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn index 0d236b18a0..23ea4aa641 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.8 Common data types MAP-CommonDataTypes { @@ -22,8 +22,8 @@ EXPORTS FTN-AddressString, ISDN-SubaddressString, ExternalSignalInfo, - Ext-ExternalSignalInfo, - AccessNetworkSignalInfo, + Ext-ExternalSignalInfo, +AccessNetworkSignalInfo, SignalInfo, maxSignalInfoLength, AlertingPattern, @@ -75,8 +75,7 @@ EXPORTS LCSClientInternalID, LCSServiceTypeID, -- WS added exports needed by gsm_map.asn (extra asn1 file to handle older protocol versions) - ProtocolId, - + ProtocolId, -- gprs location registration types GSN-Address @@ -576,7 +575,7 @@ CellGlobalIdOrServiceAreaIdFixedLength ::= OCTET STRING (SIZE (7)) -- bits 8765 Mobile Network Code 2nd digit -- octets 4 and 5 Location Area Code according to 3GPP TS 24.008 -- octets 6 and 7 Cell Identity (CI) value or - -- Service Area Code (SAC) value + -- Service Area Code (SAC) value -- according to 3GPP TS 23.003 LAIFixedLength ::= OCTET STRING (SIZE (5)) @@ -641,8 +640,8 @@ Ext-SS-Status ::= OCTET STRING (SIZE (1..5)) -- -- bits 8765: 0000 (unused) -- bits 4321: Used to convey the "P bit","R bit","A bit" and "Q bit", - -- representing supplementary service state information - -- as defined in TS 3GPP TS 23.011 [22] + -- representing supplementary service state information + -- as defined in TS 3GPP TS 23.011 [22] -- bit 4: "Q bit" diff --git a/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn b/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn index 194b079700..db770477bd 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.4 MAP Dialogue Information MAP-DialogueInformation { diff --git a/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn index 2ac73cadea..ef9c3f8e03 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.7 Error data types MAP-ER-DataTypes { @@ -176,7 +176,7 @@ AbsentSubscriberSM-Param ::= SEQUENCE { -- or for GPRS extensionContainer ExtensionContainer OPTIONAL, ..., - additionalAbsentSubscriberDiagnosticSM [0] AbsentSubscriberDiagnosticSM OPTIONAL, + additionalAbsentSubscriberDiagnosticSM [0] AbsentSubscriberDiagnosticSM OPTIONAL, -- if received, additionalAbsentSubscriberDiagnosticSM -- is for GPRS and absentSubscriberDiagnosticSM is -- for non-GPRS @@ -240,7 +240,7 @@ UnknownSubscriberDiagnostic ::= ENUMERATED { gprs-eps-SubscriptionUnknown (1), ..., npdbMismatch (2)} - -- if unknown values are received in + -- if unknown values are received in -- UnknownSubscriberDiagnostic they shall be discarded NumberChangedParam ::= SEQUENCE { diff --git a/epan/dissectors/asn1/gsm_map/MAP-Errors.asn b/epan/dissectors/asn1/gsm_map/MAP-Errors.asn index 8a6a3de212..3cbb08a4ca 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Errors.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Errors.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.6.6 Errors MAP-Errors { diff --git a/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn index be7d8166f9..5b4531eed8 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn @@ -1,6 +1,6 @@ -- MAP-ExtensionDataTypes.asn -- --- Taken from 3GPP TS 29.002 V15.4.0 (2018-12) +-- Taken from 3GPP TS 29.002 V15.5.0 (2019-06) -- -- 17.7.11 Extension data types -- @@ -29,7 +29,7 @@ EXPORTS MAP-EXTENSION ::= CLASS { &ExtensionType OPTIONAL, - &extensionId OBJECT IDENTIFIER } + &extensionId OBJECT IDENTIFIER } -- The length of the Object Identifier shall not exceed 16 octets and the -- number of components of the Object Identifier shall not exceed 16 diff --git a/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn index c6ead5219f..c37a593e45 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn @@ -1,4 +1,4 @@ --- Taken from 3GPP TS 29.002 V15.4.0 (2018-12) +-- Taken from 3GPP TS 29.002 V15.5.0 (2019-06) -- --17.7.12 Group Call data types diff --git a/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn b/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn index 11546b970a..bccc06e1a9 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.6.7 Group Call operations MAP-Group-Call-Operations { diff --git a/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn index ce11a6f8d1..8a25608783 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn @@ -1,6 +1,6 @@ -- MAP-LCS-DataTypes.asn -- --- Taken from 3GPP TS 29.002 V15.4.0 (2018-12) +-- Taken from 3GPP TS 29.002 V15.5.0 (2019-06) -- -- 17.7.13 Location service data types -- @@ -39,7 +39,9 @@ ReportingPLMNList, PeriodicLDRInfo, SequenceNumber, LCSClientType, -LCS-Priority +LCS-Priority, +OccurrenceInfo, +IntervalTime ; IMPORTS @@ -108,7 +110,7 @@ LCSLocationInfo ::= SEQUENCE { lmsi [0] LMSI OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ... , - gprsNodeIndicator [2] NULL OPTIONAL, + gprsNodeIndicator [2] NULL OPTIONAL, -- gprsNodeIndicator is set only if the SGSN number is sent as the Network Node Number additional-Number [3] Additional-Number OPTIONAL, supportedLCS-CapabilitySets [4] SupportedLCS-CapabilitySets OPTIONAL, @@ -376,7 +378,7 @@ maxReportingInterval INTEGER ::= 8639999 ReportingPLMNList::= SEQUENCE { plmn-ListPrioritized [0] NULL OPTIONAL, - plmn-List [1] PLMNList, + plmn-List [1] PLMNList, ...} PLMNList::= SEQUENCE SIZE (1..maxNumOfReportingPLMN) OF @@ -385,8 +387,8 @@ PLMNList::= SEQUENCE SIZE (1..maxNumOfReportingPLMN) OF maxNumOfReportingPLMN INTEGER ::= 20 ReportingPLMN::= SEQUENCE { - plmn-Id [0] PLMN-Id, - ran-Technology [1] RAN-Technology OPTIONAL, + plmn-Id [0] PLMN-Id, + ran-Technology [1] RAN-Technology OPTIONAL, ran-PeriodicLocationSupport [2] NULL OPTIONAL, ...} @@ -400,7 +402,7 @@ ProvideSubscriberLocation-Res ::= SEQUENCE { ageOfLocationEstimate [0] AgeOfLocationInformation OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ... , - add-LocationEstimate [2] Add-GeographicalInformation OPTIONAL, + add-LocationEstimate [2] Add-GeographicalInformation OPTIONAL, deferredmt-lrResponseIndicator [3] NULL OPTIONAL, geranPositioningData [4] PositioningDataInformation OPTIONAL, utranPositioningData [5] UtranPositioningDataInfo OPTIONAL, @@ -624,7 +626,7 @@ SubscriberLocationReport-Arg ::= SEQUENCE { utranGANSSpositioningData [25] UtranGANSSpositioningData OPTIONAL, targetServingNodeForHandover [26] ServingNodeAddress OPTIONAL, utranAdditionalPositioningData [27] UtranAdditionalPositioningData OPTIONAL, - utranBaroPressureMeas [28] UtranBaroPressureMeas OPTIONAL, + utranBaroPressureMeas [28] UtranBaroPressureMeas OPTIONAL, utranCivicAddress [29] UtranCivicAddress OPTIONAL } -- one of msisdn or imsi is mandatory diff --git a/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn index c787206c92..c38bf09047 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.6.8 Location service operations MAP-LocationServiceOperations { diff --git a/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn index 6f37a53f25..ef66186bab 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.1 Mobile Service data types MAP-MS-DataTypes { @@ -16,9 +16,9 @@ BEGIN EXPORTS -- WS modification: for Ericsson proprietary extensions - RequestedEquipmentInfo, - TripletList, - QuintupletList, + RequestedEquipmentInfo, + TripletList, + QuintupletList, -- End WS modification -- location registration types UpdateLocationArg, @@ -274,7 +274,7 @@ UpdateLocationArg ::= SEQUENCE { } VLR-Capability ::= SEQUENCE{ - supportedCamelPhases [0] SupportedCamelPhases OPTIONAL, + supportedCamelPhases [0] SupportedCamelPhases OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ... , solsaSupportIndicator [2] NULL OPTIONAL, @@ -413,14 +413,14 @@ PurgeMS-Res ::= SEQUENCE { SendIdentificationArg ::= SEQUENCE { tmsi TMSI, - numberOfRequestedVectors NumberOfRequestedVectors OPTIONAL, + numberOfRequestedVectors NumberOfRequestedVectors OPTIONAL, -- within a dialogue numberOfRequestedVectors shall be present in -- the first service request and shall not be present in subsequent service requests. -- If received in a subsequent service request it shall be discarded. segmentationProhibited NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., - msc-Number ISDN-AddressString OPTIONAL, + msc-Number ISDN-AddressString OPTIONAL, previous-LAI [0] LAIFixedLength OPTIONAL, hopCounter [1] HopCounter OPTIONAL, mtRoamingForwardingSupported [2] NULL OPTIONAL, @@ -617,8 +617,8 @@ SGSN-Capability ::= SEQUENCE{ extensionContainer [1] ExtensionContainer OPTIONAL, ... , superChargerSupportedInServingNetworkEntity [2] SuperChargerInfo OPTIONAL , - gprsEnhancementsSupportIndicator [3] NULL OPTIONAL, - supportedCamelPhases [4] SupportedCamelPhases OPTIONAL, + gprsEnhancementsSupportIndicator [3] NULL OPTIONAL, + supportedCamelPhases [4] SupportedCamelPhases OPTIONAL, supportedLCS-CapabilitySets [5] SupportedLCS-CapabilitySets OPTIONAL, offeredCamel4CSIs [6] OfferedCamel4CSIs OPTIONAL, smsCallBarringSupportIndicator [7] NULL OPTIONAL, supportedRAT-TypesIndicator [8] SupportedRAT-Types OPTIONAL, @@ -627,16 +627,16 @@ SGSN-Capability ::= SEQUENCE{ homogeneousSupportOfIMSVoiceOverPSSessions [11] BOOLEAN OPTIONAL, -- "true" indicates homogeneous support, "false" indicates homogeneous non-support -- in the complete SGSN or MME area - cancellationTypeInitialAttach [12] NULL OPTIONAL, + cancellationTypeInitialAttach [12] NULL OPTIONAL, msisdn-lessOperation-Supported [14] NULL OPTIONAL, updateofHomogeneousSupportOfIMSVoiceOverPSSessions [15] NULL OPTIONAL, reset-ids-Supported [16] NULL OPTIONAL, ext-SupportedFeatures [17] Ext-SupportedFeatures OPTIONAL } - -- the supportedFeatures , t-adsDataRetrieval, - -- homogeneousSupportOfIMSVoiceOverPSSessions - -- /updateofHomogeneousSupportOfIMSVoiceOverPSSessions and - -- ext-SupportedFeatures are also applied to the MME/IWF + -- the supportedFeatures , t-adsDataRetrieval, + -- homogeneousSupportOfIMSVoiceOverPSSessions + -- /updateofHomogeneousSupportOfIMSVoiceOverPSSessions and + -- ext-SupportedFeatures are also applied to the MME/IWF SupportedFeatures::= BIT STRING { odb-all-apn (0), @@ -697,7 +697,7 @@ UpdateGprsLocationRes ::= SEQUENCE { ..., add-Capability NULL OPTIONAL, sgsn-mmeSeparationSupported [0] NULL OPTIONAL, - mmeRegisteredforSMS [1] NULL OPTIONAL } + mmeRegisteredforSMS [1] NULL OPTIONAL } EPLMN-List ::= SEQUENCE SIZE (1..50) OF PLMN-Id @@ -716,7 +716,7 @@ ForwardAccessSignalling-Arg ::= [3] SEQUENCE { allowedGSM-Algorithms [4] AllowedGSM-Algorithms OPTIONAL, allowedUMTS-Algorithms [5] AllowedUMTS-Algorithms OPTIONAL, radioResourceInformation [6] RadioResourceInformation OPTIONAL, - extensionContainer [3] ExtensionContainer OPTIONAL, + extensionContainer [3] ExtensionContainer OPTIONAL, ..., radioResourceList [7] RadioResourceList OPTIONAL, bssmap-ServiceHandover [9] BSSMAP-ServiceHandover OPTIONAL, @@ -728,8 +728,8 @@ ForwardAccessSignalling-Arg ::= [3] SEQUENCE { iuSelectedCodec [14] Codec OPTIONAL, alternativeChannelType [15] RadioResourceInformation OPTIONAL, tracePropagationList [17] TracePropagationList OPTIONAL, - aoipSupportedCodecsListAnchor [18] AoIPCodecsList OPTIONAL, - aoipSelectedCodecTarget [19] AoIPCodec OPTIONAL, + aoipSupportedCodecsListAnchor [18] AoIPCodecsList OPTIONAL, + aoipSelectedCodecTarget [19] AoIPCodec OPTIONAL, uesbi-Iu [20] UESBI-Iu OPTIONAL, imeisv [21] IMEI OPTIONAL } @@ -739,8 +739,8 @@ AllowedGSM-Algorithms ::= OCTET STRING (SIZE (1)) -- A node shall mark all GSM algorithms that are allowed in MSC-B AllowedUMTS-Algorithms ::= SEQUENCE { - integrityProtectionAlgorithms [0] PermittedIntegrityProtectionAlgorithms OPTIONAL, - encryptionAlgorithms [1] PermittedEncryptionAlgorithms OPTIONAL, + integrityProtectionAlgorithms [0] PermittedIntegrityProtectionAlgorithms OPTIONAL, + encryptionAlgorithms [1] PermittedEncryptionAlgorithms OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ...} @@ -878,8 +878,8 @@ PrepareHO-Res ::= [3] SEQUENCE { aoipAvailableCodecsListMap [10] AoIPCodecsList OPTIONAL } SelectedUMTS-Algorithms ::= SEQUENCE { - integrityProtectionAlgorithm [0] ChosenIntegrityProtectionAlgorithm OPTIONAL, - encryptionAlgorithm [1] ChosenEncryptionAlgorithm OPTIONAL, + integrityProtectionAlgorithm [0] ChosenIntegrityProtectionAlgorithm OPTIONAL, + encryptionAlgorithm [1] ChosenEncryptionAlgorithm OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ...} @@ -929,7 +929,7 @@ ProcessAccessSignalling-Arg ::= [3] SEQUENCE { selectedGSM-Algorithm [2] SelectedGSM-Algorithm OPTIONAL, chosenRadioResourceInformation [3] ChosenRadioResourceInformation OPTIONAL, selectedRab-Id [4] RAB-Id OPTIONAL, - extensionContainer [0] ExtensionContainer OPTIONAL, + extensionContainer [0] ExtensionContainer OPTIONAL, ..., iUSelectedCodec [5] Codec OPTIONAL, iuAvailableCodecsList [6] CodecList OPTIONAL, @@ -995,11 +995,11 @@ SelectedGSM-Algorithm ::= OCTET STRING (SIZE (1)) SendEndSignal-Arg ::= [3] SEQUENCE { an-APDU AccessNetworkSignalInfo, - extensionContainer [0] ExtensionContainer OPTIONAL, + extensionContainer [0] ExtensionContainer OPTIONAL, ...} SendEndSignal-Res ::= SEQUENCE { - extensionContainer [0] ExtensionContainer OPTIONAL, + extensionContainer [0] ExtensionContainer OPTIONAL, ...} RNCId ::= OCTET STRING (SIZE (7)) @@ -1078,7 +1078,7 @@ Re-synchronisationInfo ::= SEQUENCE { ...} SendAuthenticationInfoRes ::= [3] SEQUENCE { - authenticationSetList AuthenticationSetList OPTIONAL, + authenticationSetList AuthenticationSetList OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., eps-AuthenticationSetList [2] EPS-AuthenticationSetList OPTIONAL, @@ -1162,7 +1162,7 @@ InsertSubscriberDataArg ::= SEQUENCE { naea-PreferredCI [15] NAEA-PreferredCI OPTIONAL, -- naea-PreferredCI is included at the discretion of the HLR operator. gprsSubscriptionData [16] GPRSSubscriptionData OPTIONAL, - roamingRestrictedInSgsnDueToUnsupportedFeature [23] NULL + roamingRestrictedInSgsnDueToUnsupportedFeature [23] NULL OPTIONAL, networkAccessMode [24] NetworkAccessMode OPTIONAL, lsaInformation [25] LSAInformation OPTIONAL, @@ -1173,7 +1173,7 @@ InsertSubscriberDataArg ::= SEQUENCE { mc-SS-Info [28] MC-SS-Info OPTIONAL, cs-AllocationRetentionPriority [29] CS-AllocationRetentionPriority OPTIONAL, sgsn-CAMEL-SubscriptionInfo [17] SGSN-CAMEL-SubscriptionInfo OPTIONAL, - chargingCharacteristics [18] ChargingCharacteristics OPTIONAL, + chargingCharacteristics [18] ChargingCharacteristics OPTIONAL, accessRestrictionData [19] AccessRestrictionData OPTIONAL, ics-Indicator [20] BOOLEAN OPTIONAL, eps-SubscriptionData [31] EPS-SubscriptionData OPTIONAL, @@ -1190,9 +1190,9 @@ InsertSubscriberDataArg ::= SEQUENCE { psAndSMS-OnlyServiceProvision [42] NULL OPTIONAL, smsInSGSNAllowed [43] NULL OPTIONAL, cs-to-ps-SRVCC-Allowed-Indicator [44] NULL OPTIONAL, - pcscf-Restoration-Request [45] NULL OPTIONAL, + pcscf-Restoration-Request [45] NULL OPTIONAL, adjacentAccessRestrictionDataList [46] AdjacentAccessRestrictionDataList OPTIONAL, - imsi-Group-Id-List [47] IMSI-GroupIdList OPTIONAL, + imsi-Group-Id-List [47] IMSI-GroupIdList OPTIONAL, ueUsageType [48] UE-UsageType OPTIONAL, userPlaneIntegrityProtectionIndicator [49] NULL OPTIONAL, dl-Buffering-Suggested-Packet-Count [50] DL-Buffering-Suggested-Packet-Count OPTIONAL, @@ -1260,7 +1260,7 @@ CSG-SubscriptionDataList ::= SEQUENCE SIZE (1..50) OF CSG-SubscriptionData ::= SEQUENCE { csg-Id CSG-Id, expirationDate Time OPTIONAL, - extensionContainer ExtensionContainer OPTIONAL, + extensionContainer ExtensionContainer OPTIONAL, ..., lipa-AllowedAPNList [0] LIPA-AllowedAPNList OPTIONAL, plmn-Id [1] PLMN-Id OPTIONAL @@ -1354,7 +1354,7 @@ APN-Configuration ::= SEQUENCE { PDN-ConnectionContinuity ::= ENUMERATED { maintainPDN-Connection (0), disconnectPDN-ConnectionWithReactivationRequest (1), - disconnectPDN-ConnectionWithoutReactivationRequest (2) + disconnectPDN-ConnectionWithoutReactivationRequest (2) } NIDD-Mechanism ::= ENUMERATED { @@ -1438,8 +1438,8 @@ PDN-GW-AllocationType ::= ENUMERATED { WLAN-Offloadability ::= SEQUENCE { - wlan-offloadability-EUTRAN [0] WLAN-Offloadability-Indication OPTIONAL, - wlan-offloadability-UTRAN [1] WLAN-Offloadability-Indication OPTIONAL, + wlan-offloadability-EUTRAN [0] WLAN-Offloadability-Indication OPTIONAL, + wlan-offloadability-UTRAN [1] WLAN-Offloadability-Indication OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ... } @@ -1638,11 +1638,11 @@ DefaultGPRS-Handling ::= ENUMERATED { -- reception of values greater than 31 shall be treated as "releaseTransaction" GPRS-TriggerDetectionPoint ::= ENUMERATED { - attach (1), - attachChangeOfPosition (2), - pdp-ContextEstablishment (11), + attach (1), + attachChangeOfPosition (2), + pdp-ContextEstablishment (11), pdp-ContextEstablishmentAcknowledgement (12), - pdp-ContextChangeOfPosition (14), + pdp-ContextChangeOfPosition (14), ... } -- exception handling: -- For GPRS-CamelTDPData sequences containing this parameter with any @@ -1804,7 +1804,7 @@ ODB-GeneralData ::= BIT STRING { -- ODB-GeneralData type shall be treated like unsupported ODB-GeneralData -- When the ODB-GeneralData type is removed from the HLR for a given subscriber, -- in NoteSubscriberDataModified operation sent toward the gsmSCF - -- all bits shall be set to “O“. + -- all bits shall be set to "O". ODB-HPLMN-Data ::= BIT STRING { plmn-SpecificBarringType1 (0), @@ -1815,7 +1815,7 @@ ODB-HPLMN-Data ::= BIT STRING { -- ODB-HPLMN-Data type shall be treated like unsupported ODB-HPLMN-Data -- When the ODB-HPLMN-Data type is removed from the HLR for a given subscriber, -- in NoteSubscriberDataModified operation sent toward the gsmSCF - -- all bits shall be set to “O“. + -- all bits shall be set to "O". Ext-SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF Ext-SS-Info @@ -2102,12 +2102,12 @@ DeleteSubscriberDataArg ::= SEQUENCE { vbsGroupIndication [7] NULL OPTIONAL, vgcsGroupIndication [8] NULL OPTIONAL, camelSubscriptionInfoWithdraw [9] NULL OPTIONAL, - extensionContainer [6] ExtensionContainer OPTIONAL, + extensionContainer [6] ExtensionContainer OPTIONAL, ..., gprsSubscriptionDataWithdraw [10] GPRSSubscriptionDataWithdraw OPTIONAL, roamingRestrictedInSgsnDueToUnsuppportedFeature [11] NULL OPTIONAL, lsaInformationWithdraw [12] LSAInformationWithdraw OPTIONAL, - gmlc-ListWithdraw [13] NULL OPTIONAL, + gmlc-ListWithdraw [13] NULL OPTIONAL, istInformationWithdraw [14] NULL OPTIONAL, specificCSI-Withdraw [15] SpecificCSI-Withdraw OPTIONAL, chargingCharacteristicsWithdraw [16] NULL OPTIONAL, @@ -2207,9 +2207,9 @@ TPDU-TypeCriterion ::= SEQUENCE SIZE (1..maxNumOfTPDUTypes) OF maxNumOfTPDUTypes INTEGER ::= 5 MT-SMS-TPDU-Type ::= ENUMERATED { - sms-DELIVER (0), - sms-SUBMIT-REPORT (1), - sms-STATUS-REPORT (2), + sms-DELIVER (0), + sms-SUBMIT-REPORT (1), + sms-STATUS-REPORT (2), ... } -- exception handling: @@ -2327,7 +2327,7 @@ T-BCSM-CAMEL-TDP-CriteriaList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF O-BcsmCamelTDP-Criteria ::= SEQUENCE { o-BcsmTriggerDetectionPoint O-BcsmTriggerDetectionPoint, - destinationNumberCriteria [0] DestinationNumberCriteria OPTIONAL, + destinationNumberCriteria [0] DestinationNumberCriteria OPTIONAL, basicServiceCriteria [1] BasicServiceCriteria OPTIONAL, callTypeCriteria [2] CallTypeCriteria OPTIONAL, ..., @@ -2342,7 +2342,7 @@ T-BCSM-CAMEL-TDP-Criteria ::= SEQUENCE { DestinationNumberCriteria ::= SEQUENCE { matchType [0] MatchType, - destinationNumberList [1] DestinationNumberList OPTIONAL, + destinationNumberList [1] DestinationNumberList OPTIONAL, destinationNumberLengthList [2] DestinationNumberLengthList OPTIONAL, -- one or both of destinationNumberList and destinationNumberLengthList -- shall be present @@ -2368,11 +2368,11 @@ maxNumOfCamelDestinationNumberLengths INTEGER ::= 3 maxNumOfCamelBasicServiceCriteria INTEGER ::= 5 CallTypeCriteria ::= ENUMERATED { - forwarded (0), + forwarded (0), notForwarded (1)} MatchType ::= ENUMERATED { - inhibiting (0), + inhibiting (0), enabling (1)} O-CauseValueCriteria ::= SEQUENCE SIZE(1..maxNumOfCAMEL-O-CauseValueCriteria) OF @@ -2412,7 +2412,7 @@ SupportedCamelPhases ::= BIT STRING { -- A node shall mark in the BIT STRING all CAMEL Phases it supports. -- Other values than listed above shall be discarded. -OfferedCamel4CSIs ::= BIT STRING { +OfferedCamel4CSIs ::= BIT STRING { o-csi (0), d-csi (1), vt-csi (2), @@ -2425,7 +2425,7 @@ OfferedCamel4CSIs ::= BIT STRING { -- it offers. -- Other values than listed above shall be discarded. -OfferedCamel4Functionalities ::= BIT STRING { +OfferedCamel4Functionalities ::= BIT STRING { initiateCallAttempt (0), splitLeg (1), moveLeg (2), @@ -2441,7 +2441,7 @@ OfferedCamel4Functionalities ::= BIT STRING { or-Interactions (12), warningToneEnhancements (13), cf-Enhancements (14), - subscribedEnhancedDialledServices (15), + subscribedEnhancedDialledServices (15), servingNetworkEnhancedDialledServices (16), criteriaForChangeOfPositionDP (17), serviceChangeDP (18), @@ -2583,7 +2583,7 @@ T-BcsmCamelTDPDataList ::= SEQUENCE SIZE (1..maxNumOfCamelTDPData) OF --- T-BcsmCamelTDPData containing the same value for t-BcsmTriggerDetectionPoint. --- For CAMEL Phase 2, this means that only one instance of T-BcsmCamelTDPData is allowed --- with t-BcsmTriggerDetectionPoint being equal to DP12. - --- For CAMEL Phase 3, more TDP’s are allowed. + --- For CAMEL Phase 3, more TDP's are allowed. T-BcsmCamelTDPData ::= SEQUENCE { t-BcsmTriggerDetectionPoint T-BcsmTriggerDetectionPoint, @@ -2654,7 +2654,7 @@ ResetArg ::= SEQUENCE { -- The hlr-List parameter shall only be applicable for a restart of the HSS/HLR. extensionContainer [0] ExtensionContainer OPTIONAL, ..., - reset-Id-List [1] Reset-Id-List OPTIONAL, + reset-Id-List [1] Reset-Id-List OPTIONAL, subscriptionData [2] InsertSubscriberDataArg OPTIONAL, subscriptionDataDeletion [3] DeleteSubscriberDataArg OPTIONAL} @@ -2795,9 +2795,9 @@ DaylightSavingTime ::= ENUMERATED { -- Refer to the 3GPP TS 29.272 [144] for details. MNPInfoRes ::= SEQUENCE { - routeingNumber [0] RouteingNumber OPTIONAL, + routeingNumber [0] RouteingNumber OPTIONAL, imsi [1] IMSI OPTIONAL, - msisdn [2] ISDN-AddressString OPTIONAL, + msisdn [2] ISDN-AddressString OPTIONAL, numberPortabilityStatus [3] NumberPortabilityStatus OPTIONAL, extensionContainer [4] ExtensionContainer OPTIONAL, ... } @@ -2848,8 +2848,8 @@ RequestedInfo ::= SEQUENCE { requestedDomain [4] DomainType OPTIONAL, imei [6] NULL OPTIONAL, ms-classmark [5] NULL OPTIONAL, - mnpRequestedInfo [7] NULL OPTIONAL, - locationInformationEPS-Supported [11] NULL OPTIONAL, + mnpRequestedInfo [7] NULL OPTIONAL, + locationInformationEPS-Supported [11] NULL OPTIONAL, t-adsData [8] NULL OPTIONAL, requestedNodes [9] RequestedNodes OPTIONAL, servingNodeIndication [10] NULL OPTIONAL, @@ -2873,8 +2873,8 @@ DomainType ::= ENUMERATED { -- reception of values > 1 shall be mapped to 'cs-Domain' RequestedNodes ::= BIT STRING { - mme (0), - sgsn (1)} (SIZE (1..8)) + mme (0), + sgsn (1)} (SIZE (1..8)) -- Other bits than listed above shall be discarded. LocationInformation ::= SEQUENCE { @@ -3023,7 +3023,7 @@ PDP-ContextInfo ::= SEQUENCE { transactionId [7] TransactionId OPTIONAL, teid-ForGnAndGp [8] TEID OPTIONAL, teid-ForIu [9] TEID OPTIONAL, - ggsn-Address [10] GSN-Address OPTIONAL, + ggsn-Address [10] GSN-Address OPTIONAL, qos-Subscribed [11] Ext-QoS-Subscribed OPTIONAL, qos-Requested [12] Ext-QoS-Subscribed OPTIONAL, qos-Negotiated [13] Ext-QoS-Subscribed OPTIONAL, @@ -3125,7 +3125,7 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE { csg-SubscriptionDataList [11] CSG-SubscriptionDataList OPTIONAL, cw-Data [12] CallWaitingData OPTIONAL, ch-Data [13] CallHoldData OPTIONAL, - clip-Data [14] ClipData OPTIONAL, + clip-Data [14] ClipData OPTIONAL, clir-Data [15] ClirData OPTIONAL, ect-data [16] EctData OPTIONAL } @@ -3209,7 +3209,7 @@ RequestedCAMEL-SubscriptionInfo ::= ENUMERATED { AdditionalRequestedCAMEL-SubscriptionInfo ::= ENUMERATED { mt-sms-CSI (0), mg-csi (1), - o-IM-CSI (2), + o-IM-CSI (2), d-IM-CSI (3), vt-IM-CSI (4), ...} @@ -3279,7 +3279,7 @@ AnyTimeModificationArg ::= SEQUENCE { modificationRequestFor-CSG [10] ModificationRequestFor-CSG OPTIONAL, modificationRequestFor-CW-Data [11] ModificationRequestFor-CW-Info OPTIONAL, modificationRequestFor-CLIP-Data [12] ModificationRequestFor-CLIP-Info OPTIONAL, - modificationRequestFor-CLIR-Data [13] ModificationRequestFor-CLIR-Info OPTIONAL, + modificationRequestFor-CLIR-Data [13] ModificationRequestFor-CLIR-Info OPTIONAL, modificationRequestFor-HOLD-Data [14] ModificationRequestFor-CH-Info OPTIONAL, modificationRequestFor-ECT-Data [15] ModificationRequestFor-ECT-Info OPTIONAL } @@ -3338,7 +3338,7 @@ AnyTimeModificationRes ::= SEQUENCE { odb-Info [3] ODB-Info OPTIONAL, cw-Data [4] CallWaitingData OPTIONAL, ch-Data [5] CallHoldData OPTIONAL, - clip-Data [6] ClipData OPTIONAL, + clip-Data [6] ClipData OPTIONAL, clir-Data [7] ClirData OPTIONAL, ect-data [8] EctData OPTIONAL, serviceCentreAddress [9] AddressString OPTIONAL @@ -3387,7 +3387,7 @@ ModificationRequestFor-IP-SM-GW-Data ::= SEQUENCE { modifyRegistrationStatus [0] ModificationInstruction OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ..., - ip-sm-gw-DiameterAddress [2] NetworkNodeDiameterAddress OPTIONAL + ip-sm-gw-DiameterAddress [2] NetworkNodeDiameterAddress OPTIONAL -- ip-sm-gw-DiameterAddress may be present when ModificationInstruction is "activate" } @@ -3411,7 +3411,7 @@ NoteSubscriberDataModifiedArg ::= SEQUENCE { csg-SubscriptionDataList [6] CSG-SubscriptionDataList OPTIONAL, cw-Data [7] CallWaitingData OPTIONAL, ch-Data [8] CallHoldData OPTIONAL, - clip-Data [9] ClipData OPTIONAL, + clip-Data [9] ClipData OPTIONAL, clir-Data [10] ClirData OPTIONAL, ect-data [11] EctData OPTIONAL } @@ -3435,7 +3435,7 @@ NoteMM-EventArg::= SEQUENCE { } NoteMM-EventRes ::= SEQUENCE { - extensionContainer ExtensionContainer OPTIONAL, + extensionContainer ExtensionContainer OPTIONAL, ...} Ext-SS-InfoFor-CSE ::= CHOICE { @@ -3456,7 +3456,7 @@ Ext-CallBarringInfoFor-CSE ::= SEQUENCE { password [2] Password OPTIONAL, wrongPasswordAttemptsCounter [3] WrongPasswordAttemptsCounter OPTIONAL, notificationToCSE [4] NULL OPTIONAL, - extensionContainer [5] ExtensionContainer OPTIONAL, + extensionContainer [5] ExtensionContainer OPTIONAL, ...} -- vcsg location registration types diff --git a/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn index 49bfb39d68..dad561ca64 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.6.1 Mobile Service Operations MAP-MobileServiceOperations { @@ -540,4 +540,3 @@ cancelVcsgLocation OPERATION ::= { --Timer m CODE local:36 } END - diff --git a/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn index 8a3e6fb3fe..030350226c 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn @@ -1,5 +1,5 @@ -- 17.7.2 Operation and maintenance data types --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) diff --git a/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn index a49c3ee519..921c6b0961 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) --17.6.2 Operation and Maintenance Operations MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) diff --git a/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn b/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn index 79b5f8d84b..73bf636459 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) --17.5 MAP operation and error codes MAP-Protocol { @@ -175,3 +175,4 @@ releaseResources | mt-ForwardSM-VGCS | sendGroupCallInfo } END + diff --git a/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn index 38682d8547..c4673c1196 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.6 Short message data types MAP-SM-DataTypes { @@ -76,7 +76,8 @@ RoutingInfoForSM-Arg ::= SEQUENCE { imsi [12] IMSI OPTIONAL, t4-Trigger-Indicator [14] NULL OPTIONAL, singleAttemptDelivery [13] NULL OPTIONAL, - correlationID [15] CorrelationID OPTIONAL } + correlationID [15] CorrelationID OPTIONAL, + smsf-supportIndicator [16] NULL OPTIONAL } SM-DeliveryNotIntended ::= ENUMERATED { onlyIMSI-requested (0), @@ -92,9 +93,9 @@ SM-RP-MTI ::= INTEGER (0..10) SM-RP-SMEA ::= OCTET STRING (SIZE (1..12)) -- this parameter contains an address field which is encoded -- as defined in 3GPP TS 23.040. An address field contains 3 elements : - -- address-length - -- type-of-address - -- address-value + -- address-length + -- type-of-address + -- address-value RoutingInfoForSM-Res ::= SEQUENCE { imsi IMSI, @@ -119,12 +120,36 @@ LocationInfoWithLMSI ::= SEQUENCE { -- Network Node Number additional-Number [6] Additional-Number OPTIONAL, networkNodeDiameterAddress [7] NetworkNodeDiameterAddress OPTIONAL, - additionalNetworkNodeDiameterAddress [8] NetworkNodeDiameterAddress OPTIONAL, + additionalNetworkNodeDiameterAddress [8] NetworkNodeDiameterAddress OPTIONAL, thirdNumber [9] Additional-Number OPTIONAL, thirdNetworkNodeDiameterAddress [10] NetworkNodeDiameterAddress OPTIONAL, - imsNodeIndicator [11] NULL OPTIONAL + imsNodeIndicator [11] NULL OPTIONAL, -- gprsNodeIndicator and imsNodeIndicator shall not both be present. - -- additionalNumber and thirdNumber shall not both contain the same type of number. + -- additionalNumber and thirdNumber shall not both contain the same type of number. + smsf-3gpp-Number [12] ISDN-AddressString OPTIONAL, + smsf-3gpp-DiameterAddress [13] NetworkNodeDiameterAddress OPTIONAL, + smsf-non-3gpp-Number [14] ISDN-AddressString OPTIONAL, + smsf-non-3gpp-DiameterAddress [15] NetworkNodeDiameterAddress OPTIONAL, + smsf-3gpp-address-indicator [16] NULL OPTIONAL, + smsf-non-3gpp-address-indicator [17] NULL OPTIONAL + -- + -- If smsf-supportIndicator was not included in the request, in RoutingInfoForSM-Arg, + -- then smsf-3gpp Number/DiameterAddress, smsf-non-3gpp Number/DiameterAddress and + -- smsf-address-indicator and smsf-non-3gpp-address-indicator shall be absent. + -- + -- If smsf-3gpp-address-indicator is present, it indicates that the networkNode-Number + -- (and networkNodeDiameterAddress, if present) contains the address of an SMSF for + -- 3GPP access. + -- + -- If smsf-non-3gpp-address-indicator is present, it indicates that the + -- networkNode-Number (and networkNodeDiameterAddress, if present) contains the + -- address of an SMSF for non 3GPP access. + -- + -- At most one of gprsNodeIndicator, imsNodeIndicator, smsf-3gpp-address-indicator + -- and smsf-non-3gpp-address-indicator shall be present. Absence of all these + -- indicators indicate that the networkNode-Number (and networkNodeDiameterAddress, + -- if present) contains the address of an MSC/MME. + } Additional-Number ::= CHOICE { @@ -140,13 +165,13 @@ MO-ForwardSM-Arg ::= SEQUENCE { sm-RP-UI SignalInfo, extensionContainer ExtensionContainer OPTIONAL, ... , - imsi IMSI OPTIONAL, + imsi IMSI OPTIONAL, correlationID [0] CorrelationID OPTIONAL, sm-DeliveryOutcome [1] SM-DeliveryOutcome OPTIONAL } MO-ForwardSM-Res ::= SEQUENCE { - sm-RP-UI SignalInfo OPTIONAL, + sm-RP-UI SignalInfo OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ...} @@ -203,21 +228,21 @@ ReportSM-DeliveryStatusArg ::= SEQUENCE { gprsSupportIndicator [2] NULL OPTIONAL, -- gprsSupportIndicator is set only if the SMS-GMSC supports -- handling of two delivery outcomes - deliveryOutcomeIndicator [3] NULL OPTIONAL, + deliveryOutcomeIndicator [3] NULL OPTIONAL, -- DeliveryOutcomeIndicator is set when the SM-DeliveryOutcome -- is for GPRS - additionalSM-DeliveryOutcome [4] SM-DeliveryOutcome OPTIONAL, + additionalSM-DeliveryOutcome [4] SM-DeliveryOutcome OPTIONAL, -- If received, additionalSM-DeliveryOutcome is for GPRS -- If DeliveryOutcomeIndicator is set, then AdditionalSM-DeliveryOutcome shall be absent - additionalAbsentSubscriberDiagnosticSM [5] AbsentSubscriberDiagnosticSM OPTIONAL, + additionalAbsentSubscriberDiagnosticSM [5] AbsentSubscriberDiagnosticSM OPTIONAL, -- If received additionalAbsentSubscriberDiagnosticSM is for GPRS -- If DeliveryOutcomeIndicator is set, then AdditionalAbsentSubscriberDiagnosticSM -- shall be absent - ip-sm-gw-Indicator [6] NULL OPTIONAL, + ip-sm-gw-Indicator [6] NULL OPTIONAL, -- the ip-sm-gw indicator indicates by its presence that sm-deliveryOutcome -- is for delivery via IMS -- If present, deliveryOutcomeIndicator shall be absent. - ip-sm-gw-sm-deliveryOutcome [7] SM-DeliveryOutcome OPTIONAL, + ip-sm-gw-sm-deliveryOutcome [7] SM-DeliveryOutcome OPTIONAL, -- If received ip-sm-gw-sm-deliveryOutcome is for delivery via IMS -- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-deliveryOutcome shall be absent ip-sm-gw-absentSubscriberDiagnosticSM [8] AbsentSubscriberDiagnosticSM OPTIONAL, @@ -226,7 +251,26 @@ ReportSM-DeliveryStatusArg ::= SEQUENCE { -- shall be absent imsi [9] IMSI OPTIONAL, singleAttemptDelivery [10] NULL OPTIONAL, - correlationID [11] CorrelationID OPTIONAL + correlationID [11] CorrelationID OPTIONAL, + smsf-3gpp-deliveryOutcomeIndicator [12] NULL OPTIONAL, + -- smsf-3gpp-deliveryOutcome is set when the SM-DeliveryOutcome + -- is for 3GPP-SMSF + smsf-3gpp-deliveryOutcome [13] SM-DeliveryOutcome OPTIONAL, + -- If smsf-3gpp-deliveryOutcomeIndicator is set, then smsf-3gpp-deliveryOutcome + -- shall be absent + smsf-3gpp-absentSubscriberDiagSM [14] AbsentSubscriberDiagnosticSM OPTIONAL, + -- If smsf-3gpp-deliveryOutcomeIndicator is set, then + -- smsf-3gpp-absentSubscriberDiagSM shall be absent + smsf-non-3gpp-deliveryOutcomeIndicator [15] NULL OPTIONAL, + -- smsf-non-3gpp-deliveryOutcomeIndicator is set when the SM-DeliveryOutcome + -- is for non-3GPP-SMSF + smsf-non-3gpp-deliveryOutcome [16] SM-DeliveryOutcome OPTIONAL, + -- If smsf-non-3gpp-deliveryOutcomeIndicator is set, then smsf-non-3gpp-deliveryOutcome + -- shall be absent + smsf-non-3gpp-absentSubscriberDiagSM [17] AbsentSubscriberDiagnosticSM OPTIONAL + -- If smsf-non-3gpp-deliveryOutcomeIndicator is set, then + -- smsf-non-3gpp-absentSubscriberDiagSM shall be absent + } SM-DeliveryOutcome ::= ENUMERATED { @@ -274,7 +318,7 @@ MW-Status ::= BIT STRING { sc-AddressNotIncluded (0), mnrf-Set (1), mcef-Set (2) , - mnrg-Set (3)} (SIZE (6..16)) + mnrg-Set (3)} (SIZE (6..16)) -- exception handling: -- bits 4 to 15 shall be ignored if received and not understood diff --git a/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn index e6d70d4fc4..37feeb308f 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.5 Supplementary service codes MAP-SS-Code { diff --git a/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn index 590dde21e4..203690c747 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.4 Supplementary service data types MAP-SS-DataTypes { @@ -112,8 +112,8 @@ SS-Status ::= OCTET STRING (SIZE (1)) -- bits 8765: 0000 (unused) -- bits 4321: Used to convey the "P bit","R bit","A bit" and "Q bit", - -- representing supplementary service state information - -- as defined in TS 3GPP TS 23.011 [22] + -- representing supplementary service state information + -- as defined in TS 3GPP TS 23.011 [22] -- bit 4: "Q bit" @@ -144,7 +144,7 @@ ForwardingOptions ::= OCTET STRING (SIZE (1)) -- 01 ms busy -- 10 no reply -- 11 unconditional when used in a SRI Result, - -- or call deflection when used in a RCH Argument + -- or call deflection when used in a RCH Argument -- bits 21: 00 (unused) CallBarringInfo ::= SEQUENCE { @@ -285,9 +285,9 @@ SS-InvocationNotificationArg ::= SEQUENCE { } CCBS-RequestState ::= ENUMERATED { - request (0), - recall (1), - active (2), + request (0), + recall (1), + active (2), completed (3), suspended (4), frozen (5), diff --git a/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn index cdf8dd291a..716a3c4d44 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.6.5 Short message service operations MAP-ShortMessageServiceOperations { diff --git a/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn index fb65d7bcd8..be341763af 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) --17.6.4 Supplementary service operations MAP-SupplementaryServiceOperations { diff --git a/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn index d391597478..728209d92d 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn @@ -1,4 +1,4 @@ --- 3GPP TS 29.002 V15.4.0 (2018-12) +-- 3GPP TS 29.002 V15.5.0 (2019-06) -- 17.7.9 Teleservice Codes MAP-TS-Code { @@ -32,7 +32,7 @@ Ext-TeleserviceCode ::= OCTET STRING (SIZE (1..5)) -- OCTETS 2-5: reserved for future use. If received the -- Ext-TeleserviceCode shall be - -- treated according to the exception handling defined for the + -- treated according to the exception handling defined for the -- operation that uses this type. -- Ext-TeleserviceCode includes all values defined for TeleserviceCode. diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 69a9e4ac75..f8e0249cac 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -316,6 +316,7 @@ static int hf_gsm_map_sm_imsi = -1; /* IMSI */ static int hf_gsm_map_sm_t4_Trigger_Indicator = -1; /* NULL */ static int hf_gsm_map_sm_singleAttemptDelivery = -1; /* NULL */ static int hf_gsm_map_sm_correlationID = -1; /* CorrelationID */ +static int hf_gsm_map_sm_smsf_supportIndicator = -1; /* NULL */ static int hf_gsm_map_sm_locationInfoWithLMSI = -1; /* LocationInfoWithLMSI */ static int hf_gsm_map_sm_ip_sm_gwGuidance = -1; /* IP_SM_GW_Guidance */ static int hf_gsm_map_sm_minimumDeliveryTimeValue = -1; /* SM_DeliveryTimerValue */ @@ -329,6 +330,12 @@ static int hf_gsm_map_sm_additionalNetworkNodeDiameterAddress = -1; /* NetworkN static int hf_gsm_map_sm_thirdNumber = -1; /* Additional_Number */ static int hf_gsm_map_sm_thirdNetworkNodeDiameterAddress = -1; /* NetworkNodeDiameterAddress */ static int hf_gsm_map_sm_imsNodeIndicator = -1; /* NULL */ +static int hf_gsm_map_sm_smsf_3gpp_Number = -1; /* ISDN_AddressString */ +static int hf_gsm_map_sm_smsf_3gpp_DiameterAddress = -1; /* NetworkNodeDiameterAddress */ +static int hf_gsm_map_sm_smsf_non_3gpp_Number = -1; /* ISDN_AddressString */ +static int hf_gsm_map_sm_smsf_non_3gpp_DiameterAddress = -1; /* NetworkNodeDiameterAddress */ +static int hf_gsm_map_sm_smsf_3gpp_address_indicator = -1; /* NULL */ +static int hf_gsm_map_sm_smsf_non_3gpp_address_indicator = -1; /* NULL */ static int hf_gsm_map_sm_msc_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_sm_sgsn_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_sm_sm_RP_DA = -1; /* SM_RP_DA */ @@ -359,6 +366,12 @@ static int hf_gsm_map_sm_additionalAbsentSubscriberDiagnosticSM = -1; /* Absent static int hf_gsm_map_sm_ip_sm_gw_Indicator = -1; /* NULL */ static int hf_gsm_map_sm_ip_sm_gw_sm_deliveryOutcome = -1; /* SM_DeliveryOutcome */ static int hf_gsm_map_sm_ip_sm_gw_absentSubscriberDiagnosticSM = -1; /* AbsentSubscriberDiagnosticSM */ +static int hf_gsm_map_sm_smsf_3gpp_deliveryOutcomeIndicator = -1; /* NULL */ +static int hf_gsm_map_sm_smsf_3gpp_deliveryOutcome = -1; /* SM_DeliveryOutcome */ +static int hf_gsm_map_sm_smsf_3gpp_absentSubscriberDiagSM = -1; /* AbsentSubscriberDiagnosticSM */ +static int hf_gsm_map_sm_smsf_non_3gpp_deliveryOutcomeIndicator = -1; /* NULL */ +static int hf_gsm_map_sm_smsf_non_3gpp_deliveryOutcome = -1; /* SM_DeliveryOutcome */ +static int hf_gsm_map_sm_smsf_non_3gpp_absentSubscriberDiagSM = -1; /* AbsentSubscriberDiagnosticSM */ static int hf_gsm_map_sm_storedMSISDN = -1; /* ISDN_AddressString */ static int hf_gsm_map_sm_maximumUeAvailabilityTime = -1; /* Time */ static int hf_gsm_map_sm_smsGmscAlertEvent = -1; /* SmsGmsc_Alert_Event */ @@ -6715,6 +6728,7 @@ static const ber_sequence_t gsm_map_sm_RoutingInfoForSM_Arg_sequence[] = { { &hf_gsm_map_sm_t4_Trigger_Indicator, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { &hf_gsm_map_sm_singleAttemptDelivery, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { &hf_gsm_map_sm_correlationID, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_CorrelationID }, + { &hf_gsm_map_sm_smsf_supportIndicator, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -6760,6 +6774,12 @@ static const ber_sequence_t gsm_map_sm_LocationInfoWithLMSI_sequence[] = { { &hf_gsm_map_sm_thirdNumber, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_sm_Additional_Number }, { &hf_gsm_map_sm_thirdNetworkNodeDiameterAddress, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, { &hf_gsm_map_sm_imsNodeIndicator, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, + { &hf_gsm_map_sm_smsf_3gpp_Number, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_sm_smsf_3gpp_DiameterAddress, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, + { &hf_gsm_map_sm_smsf_non_3gpp_Number, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_sm_smsf_non_3gpp_DiameterAddress, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, + { &hf_gsm_map_sm_smsf_3gpp_address_indicator, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, + { &hf_gsm_map_sm_smsf_non_3gpp_address_indicator, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -7171,6 +7191,12 @@ static const ber_sequence_t gsm_map_sm_ReportSM_DeliveryStatusArg_sequence[] = { { &hf_gsm_map_sm_imsi , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_sm_singleAttemptDelivery, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { &hf_gsm_map_sm_correlationID, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_CorrelationID }, + { &hf_gsm_map_sm_smsf_3gpp_deliveryOutcomeIndicator, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, + { &hf_gsm_map_sm_smsf_3gpp_deliveryOutcome, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_SM_DeliveryOutcome }, + { &hf_gsm_map_sm_smsf_3gpp_absentSubscriberDiagSM, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_er_AbsentSubscriberDiagnosticSM }, + { &hf_gsm_map_sm_smsf_non_3gpp_deliveryOutcomeIndicator, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, + { &hf_gsm_map_sm_smsf_non_3gpp_deliveryOutcome, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_SM_DeliveryOutcome }, + { &hf_gsm_map_sm_smsf_non_3gpp_absentSubscriberDiagSM, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_er_AbsentSubscriberDiagnosticSM }, { NULL, 0, 0, 0, NULL } }; @@ -25310,6 +25336,10 @@ void proto_register_gsm_map(void) { { "correlationID", "gsm_map.sm.correlationID_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_sm_smsf_supportIndicator, + { "smsf-supportIndicator", "gsm_map.sm.smsf_supportIndicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_sm_locationInfoWithLMSI, { "locationInfoWithLMSI", "gsm_map.sm.locationInfoWithLMSI_element", FT_NONE, BASE_NONE, NULL, 0, @@ -25362,6 +25392,30 @@ void proto_register_gsm_map(void) { { "imsNodeIndicator", "gsm_map.sm.imsNodeIndicator_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_sm_smsf_3gpp_Number, + { "smsf-3gpp-Number", "gsm_map.sm.smsf_3gpp_Number", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_sm_smsf_3gpp_DiameterAddress, + { "smsf-3gpp-DiameterAddress", "gsm_map.sm.smsf_3gpp_DiameterAddress_element", + FT_NONE, BASE_NONE, NULL, 0, + "NetworkNodeDiameterAddress", HFILL }}, + { &hf_gsm_map_sm_smsf_non_3gpp_Number, + { "smsf-non-3gpp-Number", "gsm_map.sm.smsf_non_3gpp_Number", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_sm_smsf_non_3gpp_DiameterAddress, + { "smsf-non-3gpp-DiameterAddress", "gsm_map.sm.smsf_non_3gpp_DiameterAddress_element", + FT_NONE, BASE_NONE, NULL, 0, + "NetworkNodeDiameterAddress", HFILL }}, + { &hf_gsm_map_sm_smsf_3gpp_address_indicator, + { "smsf-3gpp-address-indicator", "gsm_map.sm.smsf_3gpp_address_indicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_sm_smsf_non_3gpp_address_indicator, + { "smsf-non-3gpp-address-indicator", "gsm_map.sm.smsf_non_3gpp_address_indicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_sm_msc_Number, { "msc-Number", "gsm_map.sm.msc_Number", FT_BYTES, BASE_NONE, NULL, 0, @@ -25482,6 +25536,30 @@ void proto_register_gsm_map(void) { { "ip-sm-gw-absentSubscriberDiagnosticSM", "gsm_map.sm.ip_sm_gw_absentSubscriberDiagnosticSM", FT_UINT32, BASE_DEC, NULL, 0, "AbsentSubscriberDiagnosticSM", HFILL }}, + { &hf_gsm_map_sm_smsf_3gpp_deliveryOutcomeIndicator, + { "smsf-3gpp-deliveryOutcomeIndicator", "gsm_map.sm.smsf_3gpp_deliveryOutcomeIndicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_sm_smsf_3gpp_deliveryOutcome, + { "smsf-3gpp-deliveryOutcome", "gsm_map.sm.smsf_3gpp_deliveryOutcome", + FT_UINT32, BASE_DEC, VALS(gsm_map_sm_SM_DeliveryOutcome_vals), 0, + "SM_DeliveryOutcome", HFILL }}, + { &hf_gsm_map_sm_smsf_3gpp_absentSubscriberDiagSM, + { "smsf-3gpp-absentSubscriberDiagSM", "gsm_map.sm.smsf_3gpp_absentSubscriberDiagSM", + FT_UINT32, BASE_DEC, NULL, 0, + "AbsentSubscriberDiagnosticSM", HFILL }}, + { &hf_gsm_map_sm_smsf_non_3gpp_deliveryOutcomeIndicator, + { "smsf-non-3gpp-deliveryOutcomeIndicator", "gsm_map.sm.smsf_non_3gpp_deliveryOutcomeIndicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_sm_smsf_non_3gpp_deliveryOutcome, + { "smsf-non-3gpp-deliveryOutcome", "gsm_map.sm.smsf_non_3gpp_deliveryOutcome", + FT_UINT32, BASE_DEC, VALS(gsm_map_sm_SM_DeliveryOutcome_vals), 0, + "SM_DeliveryOutcome", HFILL }}, + { &hf_gsm_map_sm_smsf_non_3gpp_absentSubscriberDiagSM, + { "smsf-non-3gpp-absentSubscriberDiagSM", "gsm_map.sm.smsf_non_3gpp_absentSubscriberDiagSM", + FT_UINT32, BASE_DEC, NULL, 0, + "AbsentSubscriberDiagnosticSM", HFILL }}, { &hf_gsm_map_sm_storedMSISDN, { "storedMSISDN", "gsm_map.sm.storedMSISDN", FT_BYTES, BASE_NONE, NULL, 0, @@ -31403,12 +31481,12 @@ void proto_register_gsm_map(void) { FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_gsm_ss_occurrenceInfo, - { "occurrenceInfo", "gsm_ss.occurrenceInfo_element", - FT_NONE, BASE_NONE, NULL, 0, + { "occurrenceInfo", "gsm_ss.occurrenceInfo", + FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_OccurrenceInfo_vals), 0, NULL, HFILL }}, { &hf_gsm_ss_intervalTime, - { "intervalTime", "gsm_ss.intervalTime_element", - FT_NONE, BASE_NONE, NULL, 0, + { "intervalTime", "gsm_ss.intervalTime", + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_gsm_ss_maximumInterval, { "maximumInterval", "gsm_ss.maximumInterval", |