diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2021-09-28 09:55:17 +0200 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2021-09-28 10:17:55 +0200 |
| commit | a757a93208c5cc756cb21177f66c74198c2b3f87 (patch) | |
| tree | a016e3681417bd2afa48768f7938b0ac4a9faa24 /epan/dissectors/asn1/gsm_map | |
| parent | d7a8a55d2ac0e1c2f84c0d1abb85a5551396c631 (diff) | |
GSM MAP Update to 3GPP TS 29.002 V17.1.0 (2021-06)
Diffstat (limited to 'epan/dissectors/asn1/gsm_map')
23 files changed, 649 insertions, 636 deletions
diff --git a/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn index 3e08c1f185..3f55e6d6ce 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.10 Bearer Service Codes - + MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version18 (18)} + gsm-Network (1) modules (3) map-BS-Code (20) version20 (20)} DEFINITIONS diff --git a/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn index 22a64aa244..414043ef89 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.3 Call handling data types MAP-CH-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CH-DataTypes (13) version18 (18)} + gsm-Network (1) modules (3) map-CH-DataTypes (13) version20 (20)} DEFINITIONS @@ -57,14 +57,14 @@ IMPORTS PagingArea FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version18 (18)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version20 (20)} ForwardingOptions, SS-List, CCBS-Feature FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version18 (18)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version20 (20)} ISDN-AddressString, ISDN-SubaddressString, @@ -80,18 +80,18 @@ FROM MAP-SS-DataTypes { PLMN-Id FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; CUG-CheckInfo ::= SEQUENCE { cug-Interlock CUG-Interlock, - cug-OutgoingAccess NULL OPTIONAL, + cug-OutgoingAccess NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ...} @@ -114,7 +114,7 @@ SendRoutingInfoArg ::= SEQUENCE { extensionContainer [13] ExtensionContainer OPTIONAL, ..., alertingPattern [14] AlertingPattern OPTIONAL, - ccbs-Call [15] NULL OPTIONAL, + ccbs-Call [15] NULL OPTIONAL, supportedCCBS-Phase [16] SupportedCCBS-Phase OPTIONAL, additionalSignalInfo [17] Ext-ExternalSignalInfo OPTIONAL, istSupportIndicator [18] IST-SupportIndicator OPTIONAL, @@ -163,7 +163,7 @@ CallDiversionTreatmentIndicator ::= OCTET STRING (SIZE(1)) -- network default is call diversion allowed SendRoutingInfoRes ::= [3] SEQUENCE { - imsi [9] IMSI OPTIONAL, + imsi [9] IMSI OPTIONAL, -- IMSI must be present if SendRoutingInfoRes is not segmented. -- If the TC-Result-NL segmentation option is taken the IMSI must be -- present in one segmented transmission of SendRoutingInfoRes. @@ -235,10 +235,10 @@ ForwardingData ::= SEQUENCE { longForwardedToNumber [8] FTN-AddressString OPTIONAL} ProvideRoamingNumberArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, msc-Number [1] ISDN-AddressString, msisdn [2] ISDN-AddressString OPTIONAL, - lmsi [4] LMSI OPTIONAL, + lmsi [4] LMSI OPTIONAL, gsm-BearerCapability [5] ExternalSignalInfo OPTIONAL, networkSignalInfo [6] ExternalSignalInfo OPTIONAL, suppressionOfAnnouncement [7] SuppressionOfAnnouncement OPTIONAL, @@ -268,14 +268,14 @@ ProvideRoamingNumberRes ::= SEQUENCE { roamingNumber ISDN-AddressString, extensionContainer ExtensionContainer OPTIONAL, ..., - releaseResourcesSupported NULL OPTIONAL, + releaseResourcesSupported NULL OPTIONAL, vmsc-Address ISDN-AddressString OPTIONAL } ResumeCallHandlingArg ::= SEQUENCE { callReferenceNumber [0] CallReferenceNumber OPTIONAL, basicServiceGroup [1] Ext-BasicServiceCode OPTIONAL, forwardingData [2] ForwardingData OPTIONAL, - imsi [3] IMSI OPTIONAL, + imsi [3] IMSI OPTIONAL, cug-CheckInfo [4] CUG-CheckInfo OPTIONAL, o-CSI [5] O-CSI OPTIONAL, extensionContainer [7] ExtensionContainer OPTIONAL, @@ -292,7 +292,7 @@ ResumeCallHandlingArg ::= SEQUENCE { UU-Data ::= SEQUENCE { uuIndicator [0] UUIndicator OPTIONAL, - uui [1] UUI OPTIONAL, + uui [1] UUI OPTIONAL, uusCFInteraction [2] NULL OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, ...} @@ -309,7 +309,7 @@ ResumeCallHandlingRes ::= SEQUENCE { CamelInfo ::= SEQUENCE { supportedCamelPhases SupportedCamelPhases, - suppress-T-CSI NULL OPTIONAL, + suppress-T-CSI NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ... , offeredCamel4CSIs [0] OfferedCamel4CSIs OPTIONAL } @@ -334,8 +334,8 @@ GmscCamelSubscriptionInfo ::= SEQUENCE { d-csi [5] D-CSI OPTIONAL} SetReportingStateArg ::= SEQUENCE { - imsi [0] IMSI OPTIONAL, - lmsi [1] LMSI OPTIONAL, + imsi [0] IMSI OPTIONAL, + lmsi [1] LMSI OPTIONAL, ccbs-Monitoring [2] ReportingState OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, ...} @@ -392,7 +392,7 @@ MonitoringMode ::= ENUMERATED { CallOutcome ::= ENUMERATED { success (0), failure (1), - busy (2), + busy (2), ...} -- exception handling: -- reception of values 3-10 shall be mapped to 'success' @@ -404,7 +404,7 @@ StatusReportRes ::= SEQUENCE { ...} RemoteUserFreeArg ::= SEQUENCE{ - imsi [0] IMSI, + imsi [0] IMSI, callInfo [1] ExternalSignalInfo, ccbs-Feature [2] CCBS-Feature, translatedB-Number [3] ISDN-AddressString, @@ -435,7 +435,7 @@ RUF-Outcome ::= ENUMERATED{ -- reception of values > 60 shall be mapped to 'udubFromBusyMS' IST-AlertArg ::= SEQUENCE{ - imsi [0] IMSI, + imsi [0] IMSI, extensionContainer [1] ExtensionContainer OPTIONAL, ...} @@ -447,7 +447,7 @@ IST-AlertRes ::= SEQUENCE{ ...} IST-CommandArg ::= SEQUENCE{ - imsi [0] IMSI, + imsi [0] IMSI, extensionContainer [1] ExtensionContainer OPTIONAL, ...} @@ -467,7 +467,7 @@ CallTerminationIndicator ::= ENUMERATED { -- be interpreted as ' terminateCallActivityReferred ' ReleaseResourcesArg ::= SEQUENCE{ - msrn ISDN-AddressString, + msrn ISDN-AddressString, extensionContainer ExtensionContainer OPTIONAL, ...} diff --git a/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn index af66f805b5..ba09a9d4ac 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) --17.6.3 Call Handling Operations MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CallHandlingOperations (7) - version18 (18)} + version20 (20)} DEFINITIONS @@ -52,7 +52,7 @@ joint-iso-itu-t remote-operations(4) FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} SendRoutingInfoArg, SendRoutingInfoRes, ProvideRoamingNumberArg, @@ -73,11 +73,11 @@ FROM MAP-Errors { ReleaseResourcesRes FROM MAP-CH-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CH-DataTypes (13) version18 (18)} + gsm-Network (1) modules (3) map-CH-DataTypes (13) version20 (20)} ; -sendRoutingInfo OPERATION ::= { --Timer m +sendRoutingInfo OPERATION ::= { --Timer m -- The timer is set to the upper limit of the range if the GMSC supports pre-paging. ARGUMENT SendRoutingInfoArg @@ -101,7 +101,7 @@ sendRoutingInfo OPERATION ::= { --Timer m forwardingViolation} CODE local:22 } -provideRoamingNumber OPERATION ::= { --Timer m +provideRoamingNumber OPERATION ::= { --Timer m -- The timer is set to the upper limit of the range if the HLR supports pre-paging. ARGUMENT ProvideRoamingNumberArg @@ -117,7 +117,7 @@ provideRoamingNumber OPERATION ::= { --Timer m noRoamingNumberAvailable} CODE local:4 } -resumeCallHandling OPERATION ::= { --Timer m +resumeCallHandling OPERATION ::= { --Timer m ARGUMENT ResumeCallHandlingArg RESULT @@ -130,7 +130,7 @@ resumeCallHandling OPERATION ::= { --Timer m dataMissing } CODE local:6 } -setReportingState OPERATION ::= { --Timer m +setReportingState OPERATION ::= { --Timer m ARGUMENT SetReportingStateArg RESULT @@ -145,7 +145,7 @@ setReportingState OPERATION ::= { --Timer m facilityNotSupported} CODE local:73 } -statusReport OPERATION ::= { --Timer m +statusReport OPERATION ::= { --Timer m ARGUMENT StatusReportArg RESULT @@ -158,7 +158,7 @@ statusReport OPERATION ::= { --Timer m dataMissing} CODE local:74 } -remoteUserFree OPERATION ::= { --Timer ml +remoteUserFree OPERATION ::= { --Timer ml ARGUMENT RemoteUserFreeArg RESULT @@ -172,7 +172,7 @@ remoteUserFree OPERATION ::= { --Timer ml busySubscriber} CODE local:75 } -ist-Alert OPERATION ::= { --Timer m +ist-Alert OPERATION ::= { --Timer m ARGUMENT IST-AlertArg RESULT @@ -186,7 +186,7 @@ ist-Alert OPERATION ::= { --Timer m facilityNotSupported} CODE local:87 } -ist-Command OPERATION::= { --Timer m +ist-Command OPERATION::= { --Timer m ARGUMENT IST-CommandArg RESULT @@ -200,7 +200,7 @@ ist-Command OPERATION::= { --Timer m facilityNotSupported} CODE local:88 } -releaseResources OPERATION::= { --Timer m +releaseResources OPERATION::= { --Timer m ARGUMENT ReleaseResourcesArg RESULT diff --git a/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn index 23ea4aa641..768f4172a7 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.8 Common data types MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} DEFINITIONS @@ -50,7 +50,8 @@ AccessNetworkSignalInfo, PLMN-Id, E-UTRAN-CGI, NR-CGI, - TA-Id, + TA-Id, + NR-TA-Id, RAIdentity, NetworkNodeDiameterAddress, @@ -75,7 +76,7 @@ AccessNetworkSignalInfo, 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 @@ -86,23 +87,23 @@ IMPORTS Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version18 (18)} + gsm-Network (1) modules (3) map-TS-Code (19) version20 (20)} BearerServiceCode, Ext-BearerServiceCode FROM MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version18 (18)} + gsm-Network (1) modules (3) map-BS-Code (20) version20 (20)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version18 (18)} + gsm-Network (1) modules (3) map-SS-Code (15) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; @@ -165,13 +166,13 @@ AddressString ::= OCTET STRING (SIZE (1..maxAddressLength)) maxAddressLength INTEGER ::= 20 ISDN-AddressString ::= - AddressString (SIZE (1..maxISDN-AddressLength)) + AddressString (SIZE (1..maxISDN-AddressLength)) -- This type is used to represent ISDN numbers. maxISDN-AddressLength INTEGER ::= 9 FTN-AddressString ::= - AddressString (SIZE (1..maxFTN-AddressLength)) + AddressString (SIZE (1..maxFTN-AddressLength)) -- This type is used to represent forwarded-to numbers. -- If NAI = international the first digits represent the country code (CC) -- and the network destination code (NDC) as for E.164. @@ -179,7 +180,7 @@ FTN-AddressString ::= maxFTN-AddressLength INTEGER ::= 15 ISDN-SubaddressString ::= - OCTET STRING (SIZE (1..maxISDN-SubaddressLength)) + OCTET STRING (SIZE (1..maxISDN-SubaddressLength)) -- This type is used to represent ISDN subaddresses. -- It is composed of -- a) one octet for type of subaddress and odd/even indicator. @@ -327,12 +328,12 @@ IMSI ::= TBCD-STRING (SIZE (3..8)) -- digits of MCC, MNC, MSIN are concatenated in this order. Identity ::= CHOICE { - imsi IMSI, + imsi IMSI, imsi-WithLMSI IMSI-WithLMSI} IMSI-WithLMSI ::= SEQUENCE { - imsi IMSI, - lmsi LMSI, + imsi IMSI, + lmsi LMSI, -- a special value 00000000 indicates that the LMSI is not in use ...} @@ -343,8 +344,8 @@ ASCI-CallReference ::= TBCD-STRING (SIZE (1..8)) TMSI ::= OCTET STRING (SIZE (1..4)) SubscriberId ::= CHOICE { - imsi [0] IMSI, - tmsi [1] TMSI} + imsi [0] IMSI, + tmsi [1] TMSI} IMEI ::= TBCD-STRING (SIZE (8)) -- Refers to International Mobile Station Equipment Identity @@ -358,7 +359,7 @@ HLR-Id ::= IMSI -- MSIN) forming HLR Id defined in TS 3GPP TS 23.003 [17]. HLR-List ::= SEQUENCE SIZE (1..maxNumOfHLR-Id) OF - HLR-Id + HLR-Id maxNumOfHLR-Id INTEGER ::= 50 @@ -371,7 +372,7 @@ GlobalCellId ::= OCTET STRING (SIZE (5..7)) -- bits 8765 Mobile Country Code 2nd digit -- octet 2 bits 4321 Mobile Country Code 3rd digit -- bits 8765 Mobile Network Code 3rd digit - -- or filler (1111) for 2 digit MNCs + -- or filler (1111) for 2 digit MNCs -- octet 3 bits 4321 Mobile Network Code 1st digit -- bits 8765 Mobile Network Code 2nd digit -- octets 4 and 5 Location Area Code according to TS 3GPP TS 24.008 [35] @@ -414,7 +415,7 @@ NAEA-CIC ::= OCTET STRING (SIZE (3)) -- using 4 digits. SubscriberIdentity ::= CHOICE { - imsi [0] IMSI, + imsi [0] IMSI, msisdn [1] ISDN-AddressString } @@ -439,94 +440,94 @@ LCSServiceTypeID ::= INTEGER (0..127) -- Standard LCS Service Types emergencyServices LCSServiceTypeID ::= 0 emergencyAlertServices LCSServiceTypeID ::= 1 -personTracking LCSServiceTypeID ::= 2 +personTracking LCSServiceTypeID ::= 2 fleetManagement LCSServiceTypeID ::= 3 assetManagement LCSServiceTypeID ::= 4 trafficCongestionReporting LCSServiceTypeID ::= 5 roadsideAssistance LCSServiceTypeID ::= 6 routingToNearestCommercialEnterprise LCSServiceTypeID ::= 7 -navigation LCSServiceTypeID ::= 8 +navigation LCSServiceTypeID ::= 8 --this service type is reserved for use in previous releases citySightseeing LCSServiceTypeID ::= 9 localizedAdvertising LCSServiceTypeID ::= 10 mobileYellowPages LCSServiceTypeID ::= 11 trafficAndPublicTransportationInfo LCSServiceTypeID ::= 12 -weather LCSServiceTypeID ::= 13 +weather LCSServiceTypeID ::= 13 assetAndServiceFinding LCSServiceTypeID ::= 14 -gaming LCSServiceTypeID ::= 15 -findYourFriend LCSServiceTypeID ::= 16 -dating LCSServiceTypeID ::= 17 -chatting LCSServiceTypeID ::= 18 -routeFinding LCSServiceTypeID ::= 19 -whereAmI LCSServiceTypeID ::= 20 +gaming LCSServiceTypeID ::= 15 +findYourFriend LCSServiceTypeID ::= 16 +dating LCSServiceTypeID ::= 17 +chatting LCSServiceTypeID ::= 18 +routeFinding LCSServiceTypeID ::= 19 +whereAmI LCSServiceTypeID ::= 20 -- The values of LCSServiceTypeID are defined according to 3GPP TS 22.071. -- Non Standard LCS Service Types -serv64 LCSServiceTypeID ::= 64 -serv65 LCSServiceTypeID ::= 65 -serv66 LCSServiceTypeID ::= 66 -serv67 LCSServiceTypeID ::= 67 -serv68 LCSServiceTypeID ::= 68 -serv69 LCSServiceTypeID ::= 69 -serv70 LCSServiceTypeID ::= 70 -serv71 LCSServiceTypeID ::= 71 -serv72 LCSServiceTypeID ::= 72 -serv73 LCSServiceTypeID ::= 73 -serv74 LCSServiceTypeID ::= 74 -serv75 LCSServiceTypeID ::= 75 -serv76 LCSServiceTypeID ::= 76 -serv77 LCSServiceTypeID ::= 77 -serv78 LCSServiceTypeID ::= 78 -serv79 LCSServiceTypeID ::= 79 -serv80 LCSServiceTypeID ::= 80 -serv81 LCSServiceTypeID ::= 81 -serv82 LCSServiceTypeID ::= 82 -serv83 LCSServiceTypeID ::= 83 -serv84 LCSServiceTypeID ::= 84 -serv85 LCSServiceTypeID ::= 85 -serv86 LCSServiceTypeID ::= 86 -serv87 LCSServiceTypeID ::= 87 -serv88 LCSServiceTypeID ::= 88 -serv89 LCSServiceTypeID ::= 89 -serv90 LCSServiceTypeID ::= 90 -serv91 LCSServiceTypeID ::= 91 -serv92 LCSServiceTypeID ::= 92 -serv93 LCSServiceTypeID ::= 93 -serv94 LCSServiceTypeID ::= 94 -serv95 LCSServiceTypeID ::= 95 -serv96 LCSServiceTypeID ::= 96 -serv97 LCSServiceTypeID ::= 97 -serv98 LCSServiceTypeID ::= 98 -serv99 LCSServiceTypeID ::= 99 -serv100 LCSServiceTypeID ::= 100 -serv101 LCSServiceTypeID ::= 101 -serv102 LCSServiceTypeID ::= 102 -serv103 LCSServiceTypeID ::= 103 -serv104 LCSServiceTypeID ::= 104 -serv105 LCSServiceTypeID ::= 105 -serv106 LCSServiceTypeID ::= 106 -serv107 LCSServiceTypeID ::= 107 -serv108 LCSServiceTypeID ::= 108 -serv109 LCSServiceTypeID ::= 109 -serv110 LCSServiceTypeID ::= 110 -serv111 LCSServiceTypeID ::= 111 -serv112 LCSServiceTypeID ::= 112 -serv113 LCSServiceTypeID ::= 113 -serv114 LCSServiceTypeID ::= 114 -serv115 LCSServiceTypeID ::= 115 -serv116 LCSServiceTypeID ::= 116 -serv117 LCSServiceTypeID ::= 117 -serv118 LCSServiceTypeID ::= 118 -serv119 LCSServiceTypeID ::= 119 -serv120 LCSServiceTypeID ::= 120 -serv121 LCSServiceTypeID ::= 121 -serv122 LCSServiceTypeID ::= 122 -serv123 LCSServiceTypeID ::= 123 -serv124 LCSServiceTypeID ::= 124 -serv125 LCSServiceTypeID ::= 125 -serv126 LCSServiceTypeID ::= 126 -serv127 LCSServiceTypeID ::= 127 +serv64 LCSServiceTypeID ::= 64 +serv65 LCSServiceTypeID ::= 65 +serv66 LCSServiceTypeID ::= 66 +serv67 LCSServiceTypeID ::= 67 +serv68 LCSServiceTypeID ::= 68 +serv69 LCSServiceTypeID ::= 69 +serv70 LCSServiceTypeID ::= 70 +serv71 LCSServiceTypeID ::= 71 +serv72 LCSServiceTypeID ::= 72 +serv73 LCSServiceTypeID ::= 73 +serv74 LCSServiceTypeID ::= 74 +serv75 LCSServiceTypeID ::= 75 +serv76 LCSServiceTypeID ::= 76 +serv77 LCSServiceTypeID ::= 77 +serv78 LCSServiceTypeID ::= 78 +serv79 LCSServiceTypeID ::= 79 +serv80 LCSServiceTypeID ::= 80 +serv81 LCSServiceTypeID ::= 81 +serv82 LCSServiceTypeID ::= 82 +serv83 LCSServiceTypeID ::= 83 +serv84 LCSServiceTypeID ::= 84 +serv85 LCSServiceTypeID ::= 85 +serv86 LCSServiceTypeID ::= 86 +serv87 LCSServiceTypeID ::= 87 +serv88 LCSServiceTypeID ::= 88 +serv89 LCSServiceTypeID ::= 89 +serv90 LCSServiceTypeID ::= 90 +serv91 LCSServiceTypeID ::= 91 +serv92 LCSServiceTypeID ::= 92 +serv93 LCSServiceTypeID ::= 93 +serv94 LCSServiceTypeID ::= 94 +serv95 LCSServiceTypeID ::= 95 +serv96 LCSServiceTypeID ::= 96 +serv97 LCSServiceTypeID ::= 97 +serv98 LCSServiceTypeID ::= 98 +serv99 LCSServiceTypeID ::= 99 +serv100 LCSServiceTypeID ::= 100 +serv101 LCSServiceTypeID ::= 101 +serv102 LCSServiceTypeID ::= 102 +serv103 LCSServiceTypeID ::= 103 +serv104 LCSServiceTypeID ::= 104 +serv105 LCSServiceTypeID ::= 105 +serv106 LCSServiceTypeID ::= 106 +serv107 LCSServiceTypeID ::= 107 +serv108 LCSServiceTypeID ::= 108 +serv109 LCSServiceTypeID ::= 109 +serv110 LCSServiceTypeID ::= 110 +serv111 LCSServiceTypeID ::= 111 +serv112 LCSServiceTypeID ::= 112 +serv113 LCSServiceTypeID ::= 113 +serv114 LCSServiceTypeID ::= 114 +serv115 LCSServiceTypeID ::= 115 +serv116 LCSServiceTypeID ::= 116 +serv117 LCSServiceTypeID ::= 117 +serv118 LCSServiceTypeID ::= 118 +serv119 LCSServiceTypeID ::= 119 +serv120 LCSServiceTypeID ::= 120 +serv121 LCSServiceTypeID ::= 121 +serv122 LCSServiceTypeID ::= 122 +serv123 LCSServiceTypeID ::= 123 +serv124 LCSServiceTypeID ::= 124 +serv125 LCSServiceTypeID ::= 125 +serv126 LCSServiceTypeID ::= 126 +serv127 LCSServiceTypeID ::= 127 PLMN-Id ::= OCTET STRING (SIZE (3)) -- The internal structure is defined as follows: @@ -534,7 +535,7 @@ PLMN-Id ::= OCTET STRING (SIZE (3)) -- bits 8765 Mobile Country Code 2nd digit -- octet 2 bits 4321 Mobile Country Code 3rd digit -- bits 8765 Mobile Network Code 3rd digit - -- or filler (1111) for 2 digit MNCs + -- or filler (1111) for 2 digit MNCs -- octet 3 bits 4321 Mobile Network Code 1st digit -- bits 8765 Mobile Network Code 2nd digit @@ -547,6 +548,9 @@ NR-CGI ::= OCTET STRING (SIZE (8)) TA-Id ::= OCTET STRING (SIZE (5)) -- Octets are coded as described in 3GPP TS 29.118 [152]. +NR-TA-Id ::= OCTET STRING (SIZE (6)) + -- Octets are coded as described in 3GPP TS 38.413 [153]. + RAIdentity ::= OCTET STRING (SIZE (6)) -- Routing Area Identity is coded in accordance with 3GPP TS 29.060 [105]. -- It shall contain the value part defined in 3GPP TS 29.060 only. I.e. the 3GPP TS 29.060 @@ -570,13 +574,13 @@ CellGlobalIdOrServiceAreaIdFixedLength ::= OCTET STRING (SIZE (7)) -- bits 8765 Mobile Country Code 2nd digit -- octet 2 bits 4321 Mobile Country Code 3rd digit -- bits 8765 Mobile Network Code 3rd digit - -- or filler (1111) for 2 digit MNCs + -- or filler (1111) for 2 digit MNCs -- octet 3 bits 4321 Mobile Network Code 1st digit -- 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 - -- according to 3GPP TS 23.003 + -- Service Area Code (SAC) value + -- according to 3GPP TS 23.003 LAIFixedLength ::= OCTET STRING (SIZE (5)) -- Refers to Location Area Identification defined in 3GPP TS 23.003 [17]. @@ -585,7 +589,7 @@ LAIFixedLength ::= OCTET STRING (SIZE (5)) -- bits 8765 Mobile Country Code 2nd digit -- octet 2 bits 4321 Mobile Country Code 3rd digit -- bits 8765 Mobile Network Code 3rd digit - -- or filler (1111) for 2 digit MNCs + -- or filler (1111) for 2 digit MNCs -- octet 3 bits 4321 Mobile Network Code 1st digit -- bits 8765 Mobile Network Code 2nd digit -- octets 4 and 5 Location Area Code according to 3GPP TS 24.008 [35] @@ -640,8 +644,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 db770477bd..c767f107cd 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.4 MAP Dialogue Information MAP-DialogueInformation { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-DialogueInformation (3) version18 (18)} + gsm-Network (1) modules (3) map-DialogueInformation (3) version20 (20)} DEFINITIONS @@ -29,12 +29,12 @@ FROM MobileDomainDefinitions { AddressString FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network(1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network(1) modules (3) map-CommonDataTypes (18) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn index ef9c3f8e03..5b871a2948 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.7 Error data types MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version18 (18)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version20 (20)} DEFINITIONS @@ -71,7 +71,7 @@ IMPORTS SS-Status FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version18 (18)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version20 (20)} SignalInfo, BasicServiceCode, @@ -81,18 +81,18 @@ FROM MAP-SS-DataTypes { Time FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version18 (18)} + gsm-Network (1) modules (3) map-SS-Code (15) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; RoamingNotAllowedParam ::= SEQUENCE { @@ -180,7 +180,7 @@ AbsentSubscriberSM-Param ::= SEQUENCE { -- if received, additionalAbsentSubscriberDiagnosticSM -- is for GPRS and absentSubscriberDiagnosticSM is -- for non-GPRS - imsi [1] IMSI OPTIONAL, + imsi [1] IMSI OPTIONAL, -- when sent from HLR to IP-SM-GW, IMSI shall be present if UNRI is not set -- to indicate that the absent condition is met for CS and PS but not for IMS. requestedRetransmissionTime [2] Time OPTIONAL, @@ -216,7 +216,7 @@ DataMissingParam ::= SEQUENCE { UnexpectedDataParam ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, ..., - unexpectedSubscriber [0] NULL OPTIONAL} + unexpectedSubscriber [0] NULL OPTIONAL} -- the unexpectedSubscriber indication in the unexpectedDataValue error shall not be used -- for operations that allow the unidentifiedSubscriber error. @@ -348,7 +348,7 @@ InformationNotAvailableParam ::= SEQUENCE { SubBusyForMT-SMS-Param ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, ... , - gprsConnectionSuspended NULL OPTIONAL } + gprsConnectionSuspended NULL OPTIONAL } -- If GprsConnectionSuspended is not understood it shall -- be discarded @@ -380,7 +380,7 @@ UnauthorizedRequestingNetwork-Param ::= SEQUENCE { UnauthorizedLCSClient-Param ::= SEQUENCE { unauthorizedLCSClient-Diagnostic [0] UnauthorizedLCSClient-Diagnostic OPTIONAL, - extensionContainer [1] ExtensionContainer OPTIONAL, + extensionContainer [1] ExtensionContainer OPTIONAL, ... } UnauthorizedLCSClient-Diagnostic ::= ENUMERATED { @@ -398,7 +398,7 @@ UnauthorizedLCSClient-Diagnostic ::= ENUMERATED { PositionMethodFailure-Param ::= SEQUENCE { positionMethodFailure-Diagnostic [0] PositionMethodFailure-Diagnostic OPTIONAL, - extensionContainer [1] ExtensionContainer OPTIONAL, + extensionContainer [1] ExtensionContainer OPTIONAL, ... } PositionMethodFailure-Diagnostic ::= ENUMERATED { diff --git a/epan/dissectors/asn1/gsm_map/MAP-Errors.asn b/epan/dissectors/asn1/gsm_map/MAP-Errors.asn index 3cbb08a4ca..245d5cdc3f 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Errors.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Errors.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.6.6 Errors MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} DEFINITIONS @@ -106,7 +106,7 @@ FROM Remote-Operations-Information-Objects {joint-iso-itu-t remote-operations(4) SS-Status FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version18 (18)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version20 (20)} SS-IncompatibilityCause, PW-RegistrationFailureCause, @@ -157,7 +157,7 @@ TargetCellOutsideGCA-Param, OngoingGroupCallParam FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version18 (18)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version20 (20)} ; -- generic errors diff --git a/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn index 5b4531eed8..785cd2f395 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn @@ -1,13 +1,12 @@ -- MAP-ExtensionDataTypes.asn -- --- Taken from 3GPP TS 29.002 V15.5.0 (2019-06) +-- Taken from 3GPP TS 29.002 V17.1.0 (2021-06) -- -- 17.7.11 Extension data types -- - MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} DEFINITIONS @@ -28,7 +27,7 @@ EXPORTS MAP-EXTENSION ::= CLASS { - &ExtensionType OPTIONAL, + &ExtensionType OPTIONAL, &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 @@ -46,13 +45,13 @@ SLR-ArgExtensionContainer ::= SEQUENCE { ...} PrivateExtensionList ::= SEQUENCE SIZE (1..maxNumOfPrivateExtensions) OF - PrivateExtension + PrivateExtension PrivateExtension ::= SEQUENCE { extId MAP-EXTENSION.&extensionId - ({ExtensionSet}), + ({ExtensionSet}), extType MAP-EXTENSION.&ExtensionType - ({ExtensionSet}{@extId}) OPTIONAL} + ({ExtensionSet}{@extId}) OPTIONAL} maxNumOfPrivateExtensions INTEGER ::= 10 diff --git a/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn index c37a593e45..76ec0c5358 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn @@ -1,10 +1,10 @@ --- Taken from 3GPP TS 29.002 V15.5.0 (2019-06) +-- Taken from 3GPP TS 29.002 V17.1.0 (2021-06) -- --17.7.12 Group Call data types MAP-GR-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-GR-DataTypes (23) version18 (18)} + gsm-Network (1) modules (3) map-GR-DataTypes (23) version20 (20)} DEFINITIONS @@ -36,12 +36,12 @@ IMPORTS AccessNetworkSignalInfo FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version18 (18)} + gsm-Network (1) modules (3) map-TS-Code (19) version20 (20)} Kc, AdditionalInfo, @@ -51,12 +51,12 @@ Long-GroupId, Cksn FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version18 (18)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; @@ -72,7 +72,7 @@ PrepareGroupCallArg ::= SEQUENCE { uplinkFree [3] NULL OPTIONAL, extensionContainer [4] ExtensionContainer OPTIONAL, ..., - vstk [5] VSTK OPTIONAL, + vstk [5] VSTK OPTIONAL, vstk-rand [6] VSTK-RAND OPTIONAL, talkerChannelParameter [7] NULL OPTIONAL, uplinkReplyIndicator [8] NULL OPTIONAL} @@ -89,7 +89,7 @@ PrepareGroupCallRes ::= SEQUENCE { ...} SendGroupCallEndSignalArg ::= SEQUENCE { - imsi IMSI OPTIONAL, + imsi IMSI OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., talkerPriority [0]TalkerPriority OPTIONAL, @@ -105,7 +105,7 @@ SendGroupCallEndSignalRes ::= SEQUENCE { ...} ForwardGroupCallSignallingArg ::= SEQUENCE { - imsi IMSI OPTIONAL, + imsi IMSI OPTIONAL, uplinkRequestAck [0] NULL OPTIONAL, uplinkReleaseIndication [1] NULL OPTIONAL, uplinkRejectCommand [2] NULL OPTIONAL, @@ -154,10 +154,10 @@ CipheringAlgorithm ::= OCTET STRING (SIZE (1)) -- 1000 0000 GSM A5/7 StateAttributes ::= SEQUENCE { - downlinkAttached [5] NULL OPTIONAL, - uplinkAttached [6] NULL OPTIONAL, - dualCommunication [7] NULL OPTIONAL, - callOriginator [8] NULL OPTIONAL } + downlinkAttached [5] NULL OPTIONAL, + uplinkAttached [6] NULL OPTIONAL, + dualCommunication [7] NULL OPTIONAL, + callOriginator [8] NULL OPTIONAL } -- Refers to 3GPP TS 44.068 for definitions of StateAttributes fields. @@ -167,16 +167,16 @@ SendGroupCallInfoArg ::= SEQUENCE { groupId Long-GroupId, teleservice Ext-TeleserviceCode, cellId [0] GlobalCellId OPTIONAL, - imsi [1] IMSI OPTIONAL, - tmsi [2] TMSI OPTIONAL, + imsi [1] IMSI OPTIONAL, + tmsi [2] TMSI OPTIONAL, additionalInfo [3] AdditionalInfo OPTIONAL, talkerPriority [4] TalkerPriority OPTIONAL, - cksn [5] Cksn OPTIONAL, + cksn [5] Cksn OPTIONAL, extensionContainer [6] ExtensionContainer OPTIONAL, ... } RequestedInfo ::= ENUMERATED { - anchorMSC-AddressAndASCI-CallReference (0), + anchorMSC-AddressAndASCI-CallReference (0), imsiAndAdditionalInfoAndAdditionalSubscription (1), ... } -- exception handling: @@ -186,12 +186,13 @@ RequestedInfo ::= ENUMERATED { SendGroupCallInfoRes ::= SEQUENCE { anchorMSC-Address [0] ISDN-AddressString OPTIONAL, asciCallReference [1] ASCI-CallReference OPTIONAL, - imsi [2] IMSI OPTIONAL, + imsi [2] IMSI OPTIONAL, additionalInfo [3] AdditionalInfo OPTIONAL, additionalSubscriptions [4] AdditionalSubscriptions OPTIONAL, - kc [5] Kc OPTIONAL, + kc [5] Kc OPTIONAL, extensionContainer [6] ExtensionContainer OPTIONAL, ... } END + 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 bccc06e1a9..15e508ff23 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.6.7 Group Call operations MAP-Group-Call-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Group-Call-Operations (22) - version18 (18)} + version20 (20)} DEFINITIONS @@ -35,7 +35,7 @@ joint-iso-itu-t remote-operations(4) dataMissing FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} PrepareGroupCallArg, PrepareGroupCallRes, @@ -47,11 +47,11 @@ FROM MAP-Errors { SendGroupCallInfoRes FROM MAP-GR-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-GR-DataTypes (23) version18 (18)} + gsm-Network (1) modules (3) map-GR-DataTypes (23) version20 (20)} ; -prepareGroupCall OPERATION ::= { --Timer m +prepareGroupCall OPERATION ::= { --Timer m ARGUMENT PrepareGroupCallArg RESULT @@ -62,24 +62,24 @@ prepareGroupCall OPERATION ::= { --Timer m unexpectedDataValue} CODE local:39 } -sendGroupCallEndSignal OPERATION ::= { --Timer l +sendGroupCallEndSignal OPERATION ::= { --Timer l ARGUMENT SendGroupCallEndSignalArg RESULT SendGroupCallEndSignalRes CODE local:40 } -processGroupCallSignalling OPERATION ::= { --Timer s +processGroupCallSignalling OPERATION ::= { --Timer s ARGUMENT ProcessGroupCallSignallingArg CODE local:41 } -forwardGroupCallSignalling OPERATION ::= { --Timer s +forwardGroupCallSignalling OPERATION ::= { --Timer s ARGUMENT ForwardGroupCallSignallingArg CODE local:42 } -sendGroupCallInfo OPERATION ::= { --Timer m +sendGroupCallInfo OPERATION ::= { --Timer m ARGUMENT SendGroupCallInfoArg RESULT diff --git a/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn index 8a25608783..35d930477d 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn @@ -1,13 +1,13 @@ -- MAP-LCS-DataTypes.asn -- --- Taken from 3GPP TS 29.002 V15.5.0 (2019-06) +-- Taken from 3GPP TS 29.002 V17.1.0 (2021-06) -- -- 17.7.13 Location service data types -- MAP-LCS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-LCS-DataTypes (25) version18 (18)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version20 (20)} DEFINITIONS IMPLICIT TAGS @@ -61,30 +61,30 @@ PLMN-Id, DiameterIdentity FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} ExtensionContainer, SLR-ArgExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} USSD-DataCodingScheme, USSD-String FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-SS-DataTypes (14) version18 (18)} + map-SS-DataTypes (14) version20 (20)} APN, SupportedLCS-CapabilitySets FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version18 (18)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version20 (20)} Additional-Number FROM MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version18 (18)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version20 (20)} ; @@ -107,7 +107,7 @@ RoutingInfoForLCS-Res ::= SEQUENCE { LCSLocationInfo ::= SEQUENCE { networkNode-Number ISDN-AddressString, -- NetworkNode-number can be msc-number, sgsn-number or a dummy value of "0" - lmsi [0] LMSI OPTIONAL, + lmsi [0] LMSI OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ... , gprsNodeIndicator [2] NULL OPTIONAL, @@ -126,10 +126,10 @@ ProvideSubscriberLocation-Arg ::= SEQUENCE { mlc-Number ISDN-AddressString, lcs-ClientID [0] LCS-ClientID OPTIONAL, privacyOverride [1] NULL OPTIONAL, - imsi [2] IMSI OPTIONAL, + imsi [2] IMSI OPTIONAL, msisdn [3] ISDN-AddressString OPTIONAL, - lmsi [4] LMSI OPTIONAL, - imei [5] IMEI OPTIONAL, + lmsi [4] LMSI OPTIONAL, + imei [5] IMEI OPTIONAL, lcs-Priority [6] LCS-Priority OPTIONAL, lcs-QoS [7] LCS-QoS OPTIONAL, extensionContainer [8] ExtensionContainer OPTIONAL, @@ -229,7 +229,7 @@ LCS-FormatIndicator ::= ENUMERATED { logicalName (0), e-mailAddress (1), msisdn (2), - url (3), + url (3), sipUrl (4), ... } @@ -343,11 +343,11 @@ AreaIdentification ::= OCTET STRING (SIZE (2..7)) -- bits 8765 Mobile Country Code 2nd digit -- octet 2 bits 4321 Mobile Country Code 3rd digit -- bits 8765 Mobile Network Code 3rd digit if 3 digit MNC included - -- or filler (1111) + -- or filler (1111) -- octet 3 bits 4321 Mobile Network Code 1st digit -- bits 8765 Mobile Network Code 2nd digit -- octets 4 and 5 Location Area Code (LAC) for Local Area Id, - -- Routing Area Id and Cell Global Id + -- Routing Area Id and Cell Global Id -- octet 6 Routing Area Code (RAC) for Routing Area Id -- octets 6 and 7 Cell Identity (CI) for Cell Global Id -- octets 4 until 7 Utran Cell Identity (UC-Id) for Utran Cell Id @@ -377,23 +377,23 @@ ReportingInterval ::= INTEGER (1..maxReportingInterval) maxReportingInterval INTEGER ::= 8639999 ReportingPLMNList::= SEQUENCE { - plmn-ListPrioritized [0] NULL OPTIONAL, - plmn-List [1] PLMNList, + plmn-ListPrioritized [0] NULL OPTIONAL, + plmn-List [1] PLMNList, ...} PLMNList::= SEQUENCE SIZE (1..maxNumOfReportingPLMN) OF - ReportingPLMN + ReportingPLMN maxNumOfReportingPLMN INTEGER ::= 20 ReportingPLMN::= SEQUENCE { - plmn-Id [0] PLMN-Id, - ran-Technology [1] RAN-Technology OPTIONAL, - ran-PeriodicLocationSupport [2] NULL OPTIONAL, + plmn-Id [0] PLMN-Id, + ran-Technology [1] RAN-Technology OPTIONAL, + ran-PeriodicLocationSupport [2] NULL OPTIONAL, ...} RAN-Technology ::= ENUMERATED { - gsm (0), + gsm (0), umts (1), ...} @@ -446,36 +446,36 @@ Ext-GeographicalInformation ::= OCTET STRING (SIZE (1..maxExt-GeographicalInform -- (e) Ellipsoid Point -- Any other value in octet 1 shall be treated as invalid -- Octets 2 to 8 for case (a) – Ellipsoid point with uncertainty circle - -- Degrees of Latitude 3 octets - -- Degrees of Longitude 3 octets - -- Uncertainty code 1 octet + -- Degrees of Latitude 3 octets + -- Degrees of Longitude 3 octets + -- Uncertainty code 1 octet -- Octets 2 to 11 for case (b) – Ellipsoid point with uncertainty ellipse: - -- Degrees of Latitude 3 octets - -- Degrees of Longitude 3 octets - -- Uncertainty semi-major axis 1 octet - -- Uncertainty semi-minor axis 1 octet - -- Angle of major axis 1 octet - -- Confidence 1 octet + -- Degrees of Latitude 3 octets + -- Degrees of Longitude 3 octets + -- Uncertainty semi-major axis 1 octet + -- Uncertainty semi-minor axis 1 octet + -- Angle of major axis 1 octet + -- Confidence 1 octet -- Octets 2 to 14 for case (c) – Ellipsoid point with altitude and uncertainty ellipsoid - -- Degrees of Latitude 3 octets - -- Degrees of Longitude 3 octets - -- Altitude 2 octets - -- Uncertainty semi-major axis 1 octet - -- Uncertainty semi-minor axis 1 octet - -- Angle of major axis 1 octet - -- Uncertainty altitude 1 octet - -- Confidence 1 octet + -- Degrees of Latitude 3 octets + -- Degrees of Longitude 3 octets + -- Altitude 2 octets + -- Uncertainty semi-major axis 1 octet + -- Uncertainty semi-minor axis 1 octet + -- Angle of major axis 1 octet + -- Uncertainty altitude 1 octet + -- Confidence 1 octet -- Octets 2 to 13 for case (d) – Ellipsoid Arc - -- Degrees of Latitude 3 octets - -- Degrees of Longitude 3 octets - -- Inner radius 2 octets - -- Uncertainty radius 1 octet - -- Offset angle 1 octet - -- Included angle 1 octet - -- Confidence 1 octet + -- Degrees of Latitude 3 octets + -- Degrees of Longitude 3 octets + -- Inner radius 2 octets + -- Uncertainty radius 1 octet + -- Offset angle 1 octet + -- Included angle 1 octet + -- Confidence 1 octet -- Octets 2 to 7 for case (e) – Ellipsoid Point - -- Degrees of Latitude 3 octets - -- Degrees of Longitude 3 octets + -- Degrees of Latitude 3 octets + -- Degrees of Longitude 3 octets -- -- An Ext-GeographicalInformation parameter comprising more than one octet and @@ -507,22 +507,22 @@ VelocityEstimate ::= OCTET STRING (SIZE (4..7)) -- and Uncertainty, the direction of the Vertical Speed is also included in Octet 1 -- Any other value in octet 1 shall be treated as invalid -- Octets 2 to 4 for case (a) Horizontal velocity: - -- Bearing 1 octet - -- Horizontal Speed 2 octets + -- Bearing 1 octet + -- Horizontal Speed 2 octets -- Octets 2 to 5 for case (b) – Horizontal with Vertical Velocity: - -- Bearing 1 octet - -- Horizontal Speed 2 octets - -- Vertical Speed 1 octet + -- Bearing 1 octet + -- Horizontal Speed 2 octets + -- Vertical Speed 1 octet -- Octets 2 to 5 for case (c) – Horizontal velocity with Uncertainty: - -- Bearing 1 octet - -- Horizontal Speed 2 octets - -- Uncertainty Speed 1 octet + -- Bearing 1 octet + -- Horizontal Speed 2 octets + -- Uncertainty Speed 1 octet -- Octets 2 to 7 for case (d) – Horizontal with Vertical Velocity and Uncertainty: - -- Bearing 1 octet - -- Horizontal Speed 2 octets - -- Vertical Speed 1 octet - -- Horizontal Uncertainty Speed 1 octet - -- Vertical Uncertainty Speed 1 octet + -- Bearing 1 octet + -- Horizontal Speed 2 octets + -- Vertical Speed 1 octet + -- Horizontal Uncertainty Speed 1 octet + -- Vertical Uncertainty Speed 1 octet PositioningDataInformation ::= OCTET STRING (SIZE (2..maxPositioningDataInformation)) -- Refers to the Positioning Data defined in 3GPP TS 49.031. @@ -599,8 +599,8 @@ SubscriberLocationReport-Arg ::= SEQUENCE { lcs-ClientID LCS-ClientID, lcsLocationInfo LCSLocationInfo, msisdn [0] ISDN-AddressString OPTIONAL, - imsi [1] IMSI OPTIONAL, - imei [2] IMEI OPTIONAL, + imsi [1] IMSI OPTIONAL, + imei [2] IMEI OPTIONAL, na-ESRD [3] ISDN-AddressString OPTIONAL, na-ESRK [4] ISDN-AddressString OPTIONAL, locationEstimate [5] Ext-GeographicalInformation OPTIONAL, diff --git a/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn index c38bf09047..2ef800ee5e 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.6.8 Location service operations MAP-LocationServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-LocationServiceOperations (24) - version18 (18)} + version20 (20)} DEFINITIONS @@ -40,7 +40,7 @@ systemFailure, illegalSubscriber FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} RoutingInfoForLCS-Arg, RoutingInfoForLCS-Res, @@ -50,10 +50,10 @@ FROM MAP-Errors { SubscriberLocationReport-Res FROM MAP-LCS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-LCS-DataTypes (25) version18 (18)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version20 (20)} ; -sendRoutingInfoForLCS OPERATION ::= { --Timer m +sendRoutingInfoForLCS OPERATION ::= { --Timer m ARGUMENT RoutingInfoForLCS-Arg RESULT @@ -68,7 +68,7 @@ sendRoutingInfoForLCS OPERATION ::= { --Timer m unauthorizedRequestingNetwork } CODE local:85 } -provideSubscriberLocation OPERATION ::= { --Timer ml +provideSubscriberLocation OPERATION ::= { --Timer ml ARGUMENT ProvideSubscriberLocation-Arg RESULT @@ -87,7 +87,7 @@ provideSubscriberLocation OPERATION ::= { --Timer ml positionMethodFailure } CODE local:83 } -subscriberLocationReport OPERATION ::= { --Timer m +subscriberLocationReport OPERATION ::= { --Timer m ARGUMENT SubscriberLocationReport-Arg RESULT diff --git a/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn index ef66186bab..18e7304752 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.1 Mobile Service data types MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version18 (18)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version20 (20)} DEFINITIONS @@ -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, @@ -176,22 +176,22 @@ IMPORTS CliRestrictionOption FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version18 (18)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version20 (20)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version18 (18)} + gsm-Network (1) modules (3) map-SS-Code (15) version20 (20)} Ext-BearerServiceCode FROM MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version18 (18)} + gsm-Network (1) modules (3) map-BS-Code (20) version20 (20)} Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version18 (18)} + gsm-Network (1) modules (3) map-TS-Code (19) version20 (20)} AddressString, ISDN-AddressString, @@ -226,37 +226,38 @@ DiameterIdentity, Time, E-UTRAN-CGI, NR-CGI, -TA-Id, +TA-Id, +NR-TA-Id, RAIdentity, NetworkNodeDiameterAddress FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} AbsentSubscriberDiagnosticSM FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version18 (18)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version20 (20)} TracePropagationList FROM MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version18 (18)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version20 (20)} ; -- location registration types UpdateLocationArg ::= SEQUENCE { - imsi IMSI, + imsi IMSI, msc-Number [1] ISDN-AddressString, vlr-Number ISDN-AddressString, - lmsi [10] LMSI OPTIONAL, + lmsi [10] LMSI OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ... , vlr-Capability [6] VLR-Capability OPTIONAL, @@ -336,8 +337,8 @@ UpdateLocationRes ::= SEQUENCE { hlr-Number ISDN-AddressString, extensionContainer ExtensionContainer OPTIONAL, ..., - add-Capability NULL OPTIONAL, - pagingArea-Capability [0]NULL OPTIONAL } + add-Capability NULL OPTIONAL, + pagingArea-Capability [0]NULL OPTIONAL } ADD-Info ::= SEQUENCE { imeisv [0] IMEI, @@ -352,7 +353,7 @@ PagingArea ::= SEQUENCE SIZE (1..5) OF LocationArea LocationArea ::= CHOICE { laiFixedLength [0] LAIFixedLength, - lac [1] LAC} + lac [1] LAC} LAC ::= OCTET STRING (SIZE (2)) @@ -395,7 +396,7 @@ CancelLocationRes ::= SEQUENCE { ...} PurgeMS-Arg ::= [3] SEQUENCE { - imsi IMSI, + imsi IMSI, vlr-Number [0] ISDN-AddressString OPTIONAL, sgsn-Number [1] ISDN-AddressString OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, @@ -412,12 +413,12 @@ PurgeMS-Res ::= SEQUENCE { freezeM-TMSI [2] NULL OPTIONAL } SendIdentificationArg ::= SEQUENCE { - tmsi TMSI, + tmsi TMSI, 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, + segmentationProhibited NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., msc-Number ISDN-AddressString OPTIONAL, @@ -430,7 +431,7 @@ SendIdentificationArg ::= SEQUENCE { HopCounter ::= INTEGER (0..3) SendIdentificationRes ::= [3] SEQUENCE { - imsi IMSI OPTIONAL, + imsi IMSI OPTIONAL, -- IMSI shall be present in the first (or only) service response of a dialogue. -- If multiple service requests are present in a dialogue then IMSI -- shall not be present in any service response other than the first one. @@ -448,23 +449,23 @@ AuthenticationSetList ::= CHOICE { quintupletList [1] QuintupletList } TripletList ::= SEQUENCE SIZE (1..5) OF - AuthenticationTriplet + AuthenticationTriplet QuintupletList ::= SEQUENCE SIZE (1..5) OF - AuthenticationQuintuplet + AuthenticationQuintuplet AuthenticationTriplet ::= SEQUENCE { - rand RAND, - sres SRES, - kc Kc, + rand RAND, + sres SRES, + kc Kc, ...} AuthenticationQuintuplet ::= SEQUENCE { - rand RAND, - xres XRES, - ck CK, - ik IK, - autn AUTN, + rand RAND, + xres XRES, + ck CK, + ik IK, + autn AUTN, ...} CurrentSecurityContext ::= CHOICE { @@ -472,14 +473,14 @@ CurrentSecurityContext ::= CHOICE { umts-SecurityContextData [1] UMTS-SecurityContextData } GSM-SecurityContextData ::= SEQUENCE { - kc Kc, - cksn Cksn, + kc Kc, + cksn Cksn, ... } UMTS-SecurityContextData ::= SEQUENCE { - ck CK, - ik IK, - ksi KSI, + ck CK, + ik IK, + ksi KSI, ... } RAND ::= OCTET STRING (SIZE (16)) @@ -505,13 +506,13 @@ KSI ::= OCTET STRING (SIZE (1)) -- The internal structure is defined in 3GPP TS 24.008 AuthenticationFailureReportArg ::= SEQUENCE { - imsi IMSI, + imsi IMSI, failureCause FailureCause, extensionContainer ExtensionContainer OPTIONAL, ... , re-attempt BOOLEAN OPTIONAL, accessType AccessType OPTIONAL, - rand RAND OPTIONAL, + rand RAND OPTIONAL, vlr-Number [0] ISDN-AddressString OPTIONAL, sgsn-Number [1] ISDN-AddressString OPTIONAL } @@ -542,7 +543,7 @@ FailureCause ::= ENUMERATED { -- gprs location registration types UpdateGprsLocationArg ::= SEQUENCE { - imsi IMSI, + imsi IMSI, sgsn-Number ISDN-AddressString, sgsn-Address GSN-Address, extensionContainer ExtensionContainer OPTIONAL, @@ -593,7 +594,7 @@ EPS-Info ::= CHOICE{ isr-Information [1] ISR-Information } PDN-GW-Update ::= SEQUENCE{ - apn [0] APN OPTIONAL, + apn [0] APN OPTIONAL, pdn-gw-Identity [1] PDN-GW-Identity OPTIONAL, contextId [2] ContextId OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, @@ -613,7 +614,7 @@ ISR-Information::= BIT STRING { -- ISR-Information data type shall be discarded by the receiver SGSN-Capability ::= SEQUENCE{ - solsaSupportIndicator NULL OPTIONAL, + solsaSupportIndicator NULL OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ... , superChargerSupportedInServingNetworkEntity [2] SuperChargerInfo OPTIONAL , @@ -695,15 +696,15 @@ UpdateGprsLocationRes ::= SEQUENCE { hlr-Number ISDN-AddressString, extensionContainer ExtensionContainer OPTIONAL, ..., - add-Capability NULL OPTIONAL, + add-Capability NULL OPTIONAL, sgsn-mmeSeparationSupported [0] NULL OPTIONAL, mmeRegisteredforSMS [1] NULL OPTIONAL } EPLMN-List ::= SEQUENCE SIZE (1..50) OF - PLMN-Id + PLMN-Id AdjacentPLMN-List ::= SEQUENCE SIZE (1..50) OF - PLMN-Id + PLMN-Id -- handover types @@ -776,11 +777,11 @@ KeyStatus ::= ENUMERATED { PrepareHO-Arg ::= [3] SEQUENCE { targetCellId [0] GlobalCellId OPTIONAL, - ho-NumberNotRequired NULL OPTIONAL, + ho-NumberNotRequired NULL OPTIONAL, targetRNCId [1] RNCId OPTIONAL, an-APDU [2] AccessNetworkSignalInfo OPTIONAL, multipleBearerRequested [3] NULL OPTIONAL, - imsi [4] IMSI OPTIONAL, + imsi [4] IMSI OPTIONAL, integrityProtectionInfo [5] IntegrityProtectionInformation OPTIONAL, encryptionInfo [6] EncryptionInformation OPTIONAL, radioResourceInformation [7] RadioResourceInformation OPTIONAL, @@ -830,7 +831,7 @@ LCLS-ConfigurationPreference::= BIT STRING { BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF - BSSMAP-ServiceHandoverInfo + BSSMAP-ServiceHandoverInfo BSSMAP-ServiceHandoverInfo ::= SEQUENCE { bssmap-ServiceHandover BSSMAP-ServiceHandover, @@ -852,7 +853,7 @@ RANAP-ServiceHandover ::= OCTET STRING (SIZE (1)) RadioResourceList ::= SEQUENCE SIZE (1.. maxNumOfRadioResources) OF - RadioResource + RadioResource RadioResource ::= SEQUENCE { radioResourceInformation RadioResourceInformation, @@ -867,7 +868,7 @@ PrepareHO-Res ::= [3] SEQUENCE { relocationNumberList [1] RelocationNumberList OPTIONAL, an-APDU [2] AccessNetworkSignalInfo OPTIONAL, multicallBearerInfo [3] MulticallBearerInfo OPTIONAL, - multipleBearerNotSupported NULL OPTIONAL, + multipleBearerNotSupported NULL OPTIONAL, selectedUMTS-Algorithms [5] SelectedUMTS-Algorithms OPTIONAL, chosenRadioResourceInformation [6] ChosenRadioResourceInformation OPTIONAL, extensionContainer [4] ExtensionContainer OPTIONAL, @@ -953,11 +954,11 @@ AoIPCodec ::= OCTET STRING (SIZE (1..3)) -- The internal structure is defined as follows: -- octet 1 Coded as Speech Codec Elements in 3GPP TS 48.008 - -- with the exception that FI, PI, PT and TF bits shall - -- be set to 0 + -- with the exception that FI, PI, PT and TF bits shall + -- be set to 0 -- octets 2,3 Optional; in case of AMR codec types it defines - -- the supported codec configurations as defined in - -- 3GPP TS 48.008 + -- the supported codec configurations as defined in + -- 3GPP TS 48.008 SupportedCodecsList ::= SEQUENCE { utranCodecList [0] CodecList OPTIONAL, @@ -983,7 +984,7 @@ Codec ::= OCTET STRING (SIZE (1..4)) -- The internal structure is defined as follows: -- octet 1 Coded as Codec Identification code in 3GPP TS 26.103 -- octets 2,3,4 Parameters for the Codec as defined in 3GPP TS - -- 26.103, if available, length depending on the codec + -- 26.103, if available, length depending on the codec GERAN-Classmark ::= OCTET STRING (SIZE (2..87)) -- Octets are coded according the GERAN Classmark information element in 3GPP TS 48.008 @@ -1008,15 +1009,15 @@ RNCId ::= OCTET STRING (SIZE (7)) -- bits 8765 Mobile Country Code 2nd digit -- octet 2 bits 4321 Mobile Country Code 3rd digit -- bits 8765 Mobile Network Code 3rd digit - -- or filler (1111) for 2 digit MNCs + -- or filler (1111) for 2 digit MNCs -- octet 3 bits 4321 Mobile Network Code 1st digit -- bits 8765 Mobile Network Code 2nd digit -- octets 4 and 5 Location Area Code according to 3GPP TS 24.008 -- octets 6 and 7 RNC Id or Extended RNC Id value according to - -- 3GPP TS 25.413 + -- 3GPP TS 25.413 RelocationNumberList ::= SEQUENCE SIZE (1..maxNumOfRelocationNumber) OF - RelocationNumber + RelocationNumber MulticallBearerInfo ::= INTEGER (1..maxNumOfRelocationNumber) @@ -1056,10 +1057,10 @@ maxNumOfEncryptionInfo INTEGER ::= 100 -- authentication management types SendAuthenticationInfoArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, numberOfRequestedVectors NumberOfRequestedVectors, - segmentationProhibited NULL OPTIONAL, - immediateResponsePreferred [1] NULL OPTIONAL, + segmentationProhibited NULL OPTIONAL, + immediateResponsePreferred [1] NULL OPTIONAL, re-synchronisationInfo Re-synchronisationInfo OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ..., @@ -1073,8 +1074,8 @@ SendAuthenticationInfoArg ::= SEQUENCE { NumberOfRequestedVectors ::= INTEGER (1..5) Re-synchronisationInfo ::= SEQUENCE { - rand RAND, - auts AUTS, + rand RAND, + auts AUTS, ...} SendAuthenticationInfoRes ::= [3] SEQUENCE { @@ -1085,15 +1086,15 @@ SendAuthenticationInfoRes ::= [3] SEQUENCE { ueUsageType [3] UE-UsageType OPTIONAL } EPS-AuthenticationSetList ::= SEQUENCE SIZE (1..5) OF - EPC-AV + EPC-AV UE-UsageType::= OCTET STRING (SIZE (4)) -- octets are coded as defined in 3GPP TS 29.272 [144] EPC-AV ::= SEQUENCE { - rand RAND, - xres XRES, - autn AUTN, + rand RAND, + xres XRES, + autn AUTN, kasme KASME, extensionContainer ExtensionContainer OPTIONAL, ...} @@ -1119,7 +1120,7 @@ RequestingNodeType ::= ENUMERATED { -- equipment management types CheckIMEI-Arg ::= SEQUENCE { - imei IMEI, + imei IMEI, requestedEquipmentInfo RequestedEquipmentInfo, extensionContainer ExtensionContainer OPTIONAL, ...} @@ -1137,25 +1138,25 @@ RequestedEquipmentInfo::= BIT STRING { -- RequestedEquipmentInfo data type shall be discarded by the receiver UESBI-Iu ::= SEQUENCE { - uesbi-IuA [0] UESBI-IuA OPTIONAL, - uesbi-IuB [1] UESBI-IuB OPTIONAL, + uesbi-IuA [0] UESBI-IuA OPTIONAL, + uesbi-IuB [1] UESBI-IuB OPTIONAL, ...} -UESBI-IuA ::= BIT STRING (SIZE(1..128)) +UESBI-IuA ::= BIT STRING (SIZE(1..128)) -- See 3GPP TS 25.413 -UESBI-IuB ::= BIT STRING (SIZE(1..128)) +UESBI-IuB ::= BIT STRING (SIZE(1..128)) -- See 3GPP TS 25.413 EquipmentStatus ::= ENUMERATED { - whiteListed (0), - blackListed (1), - greyListed (2)} + permittedListed (0), + prohibitedListed (1), + trackingListed (2)} -- subscriber management types InsertSubscriberDataArg ::= SEQUENCE { - imsi [0] IMSI OPTIONAL, + imsi [0] IMSI OPTIONAL, COMPONENTS OF SubscriberData, extensionContainer [14] ExtensionContainer OPTIONAL, ... , @@ -1163,7 +1164,7 @@ InsertSubscriberDataArg ::= SEQUENCE { -- naea-PreferredCI is included at the discretion of the HLR operator. gprsSubscriptionData [16] GPRSSubscriptionData OPTIONAL, roamingRestrictedInSgsnDueToUnsupportedFeature [23] NULL - OPTIONAL, + OPTIONAL, networkAccessMode [24] NetworkAccessMode OPTIONAL, lsaInformation [25] LSAInformation OPTIONAL, lmu-Indicator [21] NULL OPTIONAL, @@ -1198,28 +1199,29 @@ InsertSubscriberDataArg ::= SEQUENCE { dl-Buffering-Suggested-Packet-Count [50] DL-Buffering-Suggested-Packet-Count OPTIONAL, reset-Id-List [51] Reset-Id-List OPTIONAL, eDRX-Cycle-Length-List [52] EDRX-Cycle-Length-List OPTIONAL, - ext-AccessRestrictionData [53] Ext-AccessRestrictionData OPTIONAL } + ext-AccessRestrictionData [53] Ext-AccessRestrictionData OPTIONAL, + iab-Operation-Allowed-Indicator [54] NULL OPTIONAL } -- If the Network Access Mode parameter is sent, it shall be present only in -- the first sequence if seqmentation is used EDRX-Cycle-Length-List ::= SEQUENCE SIZE (1..8) OF - EDRX-Cycle-Length + EDRX-Cycle-Length EDRX-Cycle-Length ::= SEQUENCE { - rat-Type [0] Used-RAT-Type, - eDRX-Cycle-Length-Value [1] EDRX-Cycle-Length-Value, - ...} + rat-Type [0] Used-RAT-Type, + eDRX-Cycle-Length-Value [1] EDRX-Cycle-Length-Value, + ...} -- The eDRX-Cycle-Length contains the subscribed eDRX-Cycle-Length applicable to a -- a specific RAT Type. EDRX-Cycle-Length-Value ::= OCTET STRING (SIZE (1)) - -- The EDRX-Cycle-Length-Value shall be encoded as specified in subclause 7.3.216 of + -- The EDRX-Cycle-Length-Value shall be encoded as specified in clause 7.3.216 of -- 3GPP TS 29.272 [144]. Reset-Id-List ::= SEQUENCE SIZE (1..50) OF - Reset-Id + Reset-Id Reset-Id ::= OCTET STRING (SIZE (1..4)) -- Reset-Ids shall be unique within the HPLMN. @@ -1238,13 +1240,13 @@ Local-GroupID ::= OCTET STRING (SIZE (1..10)) -- for details see 3GPP TS 29.272 [144] IMSI-GroupIdList ::= SEQUENCE SIZE (1..50) OF - IMSI-GroupId + IMSI-GroupId IMSI-GroupId ::= SEQUENCE { - group-Service-Id [0] Group-Service-ID, - plmnId [1] PLMN-Id, - local-Group-ID [2] Local-GroupID, - ...} + group-Service-Id [0] Group-Service-ID, + plmnId [1] PLMN-Id, + local-Group-ID [2] Local-GroupID, + ...} SubscribedPeriodicRAUTAUtimer ::= INTEGER (0..4294967295) -- This parameter carries the subscribed periodic TAU/RAU timer value in seconds as @@ -1255,25 +1257,25 @@ SubscribedPeriodicLAUtimer ::= INTEGER (0..4294967295) -- specified in 3GPP TS 24.008 [35]. CSG-SubscriptionDataList ::= SEQUENCE SIZE (1..50) OF - CSG-SubscriptionData + CSG-SubscriptionData CSG-SubscriptionData ::= SEQUENCE { - csg-Id CSG-Id, + csg-Id CSG-Id, expirationDate Time OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., lipa-AllowedAPNList [0] LIPA-AllowedAPNList OPTIONAL, - plmn-Id [1] PLMN-Id OPTIONAL + plmn-Id [1] PLMN-Id OPTIONAL } VPLMN-CSG-SubscriptionDataList ::= SEQUENCE SIZE (1..50) OF - CSG-SubscriptionData + CSG-SubscriptionData CSG-Id ::= BIT STRING (SIZE (27)) -- coded according to 3GPP TS 23.003 [17]. LIPA-AllowedAPNList ::= SEQUENCE SIZE (1..maxNumOfLIPAAllowedAPN) OF - APN + APN maxNumOfLIPAAllowedAPN INTEGER ::= 50 @@ -1282,7 +1284,7 @@ EPS-SubscriptionData ::= SEQUENCE { apn-oi-Replacement [0] APN-OI-Replacement OPTIONAL, -- this apn-oi-Replacement refers to the UE level apn-oi-Replacement. rfsp-id [2] RFSP-ID OPTIONAL, - ambr [3] AMBR OPTIONAL, + ambr [3] AMBR OPTIONAL, apn-ConfigurationProfile [4] APN-ConfigurationProfile OPTIONAL, stn-sr [6] ISDN-AddressString OPTIONAL, extensionContainer [5] ExtensionContainer OPTIONAL, @@ -1305,7 +1307,7 @@ RFSP-ID ::= INTEGER (1..256) APN-ConfigurationProfile ::= SEQUENCE { defaultContext ContextId, - completeDataListIncluded NULL OPTIONAL, + completeDataListIncluded NULL OPTIONAL, -- If segmentation is used, completeDataListIncluded may only be present in the -- first segment of APN-ConfigurationProfile. epsDataList [1] EPS-DataList, @@ -1316,7 +1318,7 @@ APN-ConfigurationProfile ::= SEQUENCE { } EPS-DataList ::= SEQUENCE SIZE (1..maxNumOfAPN-Configurations) OF - APN-Configuration + APN-Configuration maxNumOfAPN-Configurations INTEGER ::= 50 @@ -1326,13 +1328,13 @@ APN-Configuration ::= SEQUENCE { contextId [0] ContextId, pdn-Type [1] PDN-Type, servedPartyIP-IPv4-Address [2] PDP-Address OPTIONAL, - apn [3] APN, + apn [3] APN, eps-qos-Subscribed [4] EPS-QoS-Subscribed, pdn-gw-Identity [5] PDN-GW-Identity OPTIONAL, pdn-gw-AllocationType [6] PDN-GW-AllocationType OPTIONAL, vplmnAddressAllowed [7] NULL OPTIONAL, chargingCharacteristics [8] ChargingCharacteristics OPTIONAL, - ambr [9] AMBR OPTIONAL, + ambr [9] AMBR OPTIONAL, specificAPNInfoList [10] SpecificAPNInfoList OPTIONAL, extensionContainer [11] ExtensionContainer OPTIONAL, servedPartyIP-IPv6-Address [12] PDP-Address OPTIONAL, ..., @@ -1352,7 +1354,7 @@ APN-Configuration ::= SEQUENCE { } PDN-ConnectionContinuity ::= ENUMERATED { - maintainPDN-Connection (0), + maintainPDN-Connection (0), disconnectPDN-ConnectionWithReactivationRequest (1), disconnectPDN-ConnectionWithoutReactivationRequest (2) } @@ -1394,12 +1396,12 @@ AMBR ::= SEQUENCE { SpecificAPNInfoList ::= SEQUENCE SIZE (1..maxNumOfSpecificAPNInfos) OF - SpecificAPNInfo + SpecificAPNInfo maxNumOfSpecificAPNInfos INTEGER ::= 50 SpecificAPNInfo ::= SEQUENCE { - apn [0] APN, + apn [0] APN, pdn-gw-Identity [1] PDN-GW-Identity, extensionContainer [2] ExtensionContainer OPTIONAL, ... } @@ -1439,7 +1441,7 @@ 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-UTRAN [1] WLAN-Offloadability-Indication OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ... } @@ -1461,8 +1463,8 @@ AccessRestrictionData ::= BIT STRING { -- exception handling: -- The VLR shall ignore the access restriction data related to an access type not -- supported by the node. - -- The handling of the access restriction data by the SGSN is described in subclause - -- 5.3.19 of TS 23.060, in subclause 7.5.3 of TS 29.060 and subclause 7.3.6 of TS 29.274. + -- The handling of the access restriction data by the SGSN is described in clause + -- 5.3.19 of TS 23.060, in clause 7.5.3 of TS 29.060 and clause 7.3.6 of TS 29.274. -- Additional access restrictions are encoded in Ext-AccessRestrictionData bit string. @@ -1471,13 +1473,13 @@ Ext-AccessRestrictionData ::= BIT STRING { unlicensedSpectrumAsSecondaryRATNotAllowed (1) } (SIZE (1..32)) AdjacentAccessRestrictionDataList ::= SEQUENCE SIZE (1..50) OF - AdjacentAccessRestrictionData + AdjacentAccessRestrictionData AdjacentAccessRestrictionData ::= SEQUENCE { - plmnId [0] PLMN-Id, - accessRestrictionData [1] AccessRestrictionData, - ... , - ext-AccessRestrictionData [2] Ext-AccessRestrictionData OPTIONAL } + plmnId [0] PLMN-Id, + accessRestrictionData [1] AccessRestrictionData, + ... , + ext-AccessRestrictionData [2] Ext-AccessRestrictionData OPTIONAL } CS-AllocationRetentionPriority ::= OCTET STRING (SIZE (1)) -- This data type encodes each priority level defined in TS 23.107 as the binary value @@ -1499,7 +1501,7 @@ LCSInformation ::= SEQUENCE { -- data value shall be returned. GMLC-List ::= SEQUENCE SIZE (1..maxNumOfGMLC) OF - ISDN-AddressString + ISDN-AddressString -- if segmentation is used, the complete GMLC-List shall be sent in one segment maxNumOfGMLC INTEGER ::= 5 @@ -1513,7 +1515,7 @@ NetworkAccessMode ::= ENUMERATED { -- they shall be discarded. GPRSDataList ::= SEQUENCE SIZE (1..maxNumOfPDP-Contexts) OF - PDP-Context + PDP-Context maxNumOfPDP-Contexts INTEGER ::= 50 @@ -1523,7 +1525,7 @@ PDP-Context ::= SEQUENCE { pdp-Address [17] PDP-Address OPTIONAL, qos-Subscribed [18] QoS-Subscribed, vplmnAddressAllowed [19] NULL OPTIONAL, - apn [20] APN, + apn [20] APN, extensionContainer [21] ExtensionContainer OPTIONAL, ... , ext-QoS-Subscribed [0] Ext-QoS-Subscribed OPTIONAL, @@ -1546,7 +1548,7 @@ PDP-Context ::= SEQUENCE { -- it may contain an IPv4 or an IPv6 address/prefix, and it may be present -- only if pdp-Address is present; if both are present, each parameter shall -- contain a different type of address (IPv4 or IPv6). - ambr [10] AMBR OPTIONAL, + ambr [10] AMBR OPTIONAL, -- this ambr contains the AMBR associated to the APN included in the -- PDP-Context (APN-AMBR). sipto-Permission [8] SIPTO-Permission OPTIONAL, @@ -1581,7 +1583,7 @@ LIPA-Permission ::= ENUMERATED { ContextId ::= INTEGER (1..maxNumOfPDP-Contexts) GPRSSubscriptionData ::= SEQUENCE { - completeDataListIncluded NULL OPTIONAL, + completeDataListIncluded NULL OPTIONAL, -- If segmentation is used, completeDataListIncluded may only be present in the -- first segment of GPRSSubscriptionData. gprsDataList [1] GPRSDataList, @@ -1638,7 +1640,7 @@ DefaultGPRS-Handling ::= ENUMERATED { -- reception of values greater than 31 shall be treated as "releaseTransaction" GPRS-TriggerDetectionPoint ::= ENUMERATED { - attach (1), + attach (1), attachChangeOfPosition (2), pdp-ContextEstablishment (11), pdp-ContextEstablishmentAcknowledgement (12), @@ -1701,7 +1703,7 @@ LSAOnlyAccessIndicator ::= ENUMERATED { accessOutsideLSAsRestricted (1)} LSADataList ::= SEQUENCE SIZE (1..maxNumOfLSAs) OF - LSAData + LSAData maxNumOfLSAs INTEGER ::= 20 @@ -1713,7 +1715,7 @@ LSAData ::= SEQUENCE { ...} LSAInformation ::= SEQUENCE { - completeDataListIncluded NULL OPTIONAL, + completeDataListIncluded NULL OPTIONAL, -- If segmentation is used, completeDataListIncluded may only be present in the -- first segment. @@ -1734,10 +1736,10 @@ SubscriberData ::= SEQUENCE { subscriberStatus [3] SubscriberStatus OPTIONAL, bearerServiceList [4] BearerServiceList OPTIONAL, -- The exception handling for reception of unsupported / not allocated - -- bearerServiceCodes is defined in section 8.8.1 + -- bearerServiceCodes is defined in clause 8.8.1 teleserviceList [6] TeleserviceList OPTIONAL, -- The exception handling for reception of unsupported / not allocated - -- teleserviceCodes is defined in section 8.8.1 + -- teleserviceCodes is defined in clause 8.8.1 provisionedSS [7] Ext-SS-InfoList OPTIONAL, odb-Data [8] ODB-Data OPTIONAL, roamingRestrictionDueToUnsupportedFeature [9] NULL OPTIONAL, @@ -1755,12 +1757,12 @@ SubscriberStatus ::= ENUMERATED { operatorDeterminedBarring (1)} BearerServiceList ::= SEQUENCE SIZE (1..maxNumOfBearerServices) OF - Ext-BearerServiceCode + Ext-BearerServiceCode maxNumOfBearerServices INTEGER ::= 50 TeleserviceList ::= SEQUENCE SIZE (1..maxNumOfTeleservices) OF - Ext-TeleserviceCode + Ext-TeleserviceCode maxNumOfTeleservices INTEGER ::= 20 @@ -1818,7 +1820,7 @@ ODB-HPLMN-Data ::= BIT STRING { -- all bits shall be set to "O". Ext-SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF - Ext-SS-Info + Ext-SS-Info Ext-SS-Info ::= CHOICE { forwardingInfo [0] Ext-ForwInfo, @@ -1834,7 +1836,7 @@ Ext-ForwInfo ::= SEQUENCE { ...} Ext-ForwFeatureList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF - Ext-ForwFeature + Ext-ForwFeature Ext-ForwFeature ::= SEQUENCE { basicService Ext-BasicServiceCode OPTIONAL, @@ -1893,7 +1895,7 @@ Ext-CallBarInfo ::= SEQUENCE { ...} Ext-CallBarFeatureList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF - Ext-CallBarringFeature + Ext-CallBarringFeature Ext-CallBarringFeature ::= SEQUENCE { basicService Ext-BasicServiceCode OPTIONAL, @@ -1908,7 +1910,7 @@ CUG-Info ::= SEQUENCE { ...} CUG-SubscriptionList ::= SEQUENCE SIZE (0..maxNumOfCUG) OF - CUG-Subscription + CUG-Subscription CUG-Subscription ::= SEQUENCE { cug-Index CUG-Index, @@ -1931,10 +1933,10 @@ IntraCUG-Options ::= ENUMERATED { maxNumOfCUG INTEGER ::= 10 CUG-FeatureList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF - CUG-Feature + CUG-Feature Ext-BasicServiceGroupList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF - Ext-BasicServiceCode + Ext-BasicServiceCode maxNumOfExt-BasicServiceGroups INTEGER ::= 32 @@ -1966,7 +1968,7 @@ Ext-SS-Data ::= SEQUENCE { ...} LCS-PrivacyExceptionList ::= SEQUENCE SIZE (1..maxNumOfPrivacyClass) OF - LCS-PrivacyClass + LCS-PrivacyClass maxNumOfPrivacyClass INTEGER ::= 4 @@ -1998,17 +2000,17 @@ LCS-PrivacyClass ::= SEQUENCE { } ExternalClientList ::= SEQUENCE SIZE (0..maxNumOfExternalClient) OF - ExternalClient + ExternalClient maxNumOfExternalClient INTEGER ::= 5 PLMNClientList ::= SEQUENCE SIZE (1..maxNumOfPLMNClient) OF - LCSClientInternalID + LCSClientInternalID maxNumOfPLMNClient INTEGER ::= 5 Ext-ExternalClientList ::= SEQUENCE SIZE (1..maxNumOfExt-ExternalClient) OF - ExternalClient + ExternalClient maxNumOfExt-ExternalClient INTEGER ::= 35 @@ -2040,7 +2042,7 @@ NotificationToMSUser ::= ENUMERATED { -- NotificationToMSUser. ServiceTypeList ::= SEQUENCE SIZE (1..maxNumOfServiceType) OF - ServiceType + ServiceType maxNumOfServiceType INTEGER ::= 32 @@ -2054,7 +2056,7 @@ ServiceType ::= SEQUENCE { ... } MOLR-List ::= SEQUENCE SIZE (1..maxNumOfMOLR-Class) OF - MOLR-Class + MOLR-Class maxNumOfMOLR-Class INTEGER ::= 3 @@ -2065,7 +2067,7 @@ MOLR-Class ::= SEQUENCE { ...} ZoneCodeList ::= SEQUENCE SIZE (1..maxNumOfZoneCodes) - OF ZoneCode + OF ZoneCode ZoneCode ::= OCTET STRING (SIZE (2)) -- internal structure is defined in TS 3GPP TS 23.003 [17] @@ -2092,10 +2094,10 @@ RegionalSubscriptionResponse ::= ENUMERATED { regionalSubscNotSupported (3)} DeleteSubscriberDataArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, basicServiceList [1] BasicServiceList OPTIONAL, -- The exception handling for reception of unsupported/not allocated - -- basicServiceCodes is defined in section 6.8.2 + -- basicServiceCodes is defined in clause 6.8.2 ss-List [2] SS-List OPTIONAL, roamingRestrictionDueToUnsupportedFeature [4] NULL OPTIONAL, regionalSubscriptionIdentifier [5] ZoneCode OPTIONAL, @@ -2125,7 +2127,8 @@ DeleteSubscriberDataArg ::= SEQUENCE { userPlaneIntegrityProtectionWithdraw [28] NULL OPTIONAL, dl-Buffering-Suggested-Packet-Count-Withdraw [29] NULL OPTIONAL, ue-UsageTypeWithdraw [30] NULL OPTIONAL, - reset-idsWithdraw [31] NULL OPTIONAL } + reset-idsWithdraw [31] NULL OPTIONAL, + iab-OperationWithdraw [32] NULL OPTIONAL } SpecificCSI-Withdraw ::= BIT STRING { o-csi (0), @@ -2157,17 +2160,17 @@ EPS-SubscriptionDataWithdraw ::= CHOICE { contextIdList ContextIdList} ContextIdList ::= SEQUENCE SIZE (1..maxNumOfPDP-Contexts) OF - ContextId + ContextId LSAInformationWithdraw ::= CHOICE { allLSAData NULL, lsaIdentityList LSAIdentityList } LSAIdentityList ::= SEQUENCE SIZE (1..maxNumOfLSAs) OF - LSAIdentity + LSAIdentity BasicServiceList ::= SEQUENCE SIZE (1..maxNumOfBasicServices) OF - Ext-BasicServiceCode + Ext-BasicServiceCode maxNumOfBasicServices INTEGER ::= 70 @@ -2235,7 +2238,7 @@ D-CSI ::= SEQUENCE { -- camelCapabilityHandling, but may contain dp-AnalysedInfoCriteriaList. DP-AnalysedInfoCriteriaList ::= SEQUENCE SIZE (1..maxNumOfDP-AnalysedInfoCriteria) OF - DP-AnalysedInfoCriterium + DP-AnalysedInfoCriterium maxNumOfDP-AnalysedInfoCriteria INTEGER ::= 10 @@ -2349,12 +2352,12 @@ DestinationNumberCriteria ::= SEQUENCE { ...} DestinationNumberList ::= SEQUENCE SIZE (1..maxNumOfCamelDestinationNumbers) OF - ISDN-AddressString + ISDN-AddressString -- The receiving entity shall not check the format of a number in -- the dialled number list DestinationNumberLengthList ::= SEQUENCE SIZE (1..maxNumOfCamelDestinationNumberLengths) OF - INTEGER(1..maxNumOfISDN-AddressDigits) + INTEGER(1..maxNumOfISDN-AddressDigits) BasicServiceCriteria ::= SEQUENCE SIZE(1..maxNumOfCamelBasicServiceCriteria) OF Ext-BasicServiceCode @@ -2551,14 +2554,14 @@ MM-Code ::= OCTET STRING (SIZE (1)) -- PS domain MM events: -- Routeing-Area-update-in-same-SGSN MM-Code ::= '10000000'B -- Routeing-Area-update-to-other-SGSN-update-from-new-SGSN --- MM-Code ::= '10000001'B +-- MM-Code ::= '10000001'B -- Routeing-Area-update-to-other-SGSN-disconnect-by-detach --- MM-Code ::= '10000010'B +-- MM-Code ::= '10000010'B -- GPRS-Attach MM-Code ::= '10000011'B -- MS-initiated-GPRS-Detach MM-Code ::= '10000100'B -- Network-initiated-GPRS-Detach MM-Code ::= '10000101'B -- Network-initiated-transfer-to-MS-not-reachable-for-paging --- MM-Code ::= '10000110'B +-- MM-Code ::= '10000110'B -- -- If the MSC receives any other MM-code than the ones listed above for the -- CS domain, then the MSC shall ignore that MM-code. @@ -2606,7 +2609,7 @@ T-BcsmTriggerDetectionPoint ::= ENUMERATED { -- gprs location information retrieval types SendRoutingInfoForGprsArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, ggsn-Address [1] GSN-Address OPTIONAL, ggsn-Number [2] ISDN-AddressString, extensionContainer [3] ExtensionContainer OPTIONAL, @@ -2622,7 +2625,7 @@ SendRoutingInfoForGprsRes ::= SEQUENCE { -- failure report types FailureReportArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, ggsn-Number [1] ISDN-AddressString , ggsn-Address [2] GSN-Address OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, @@ -2636,7 +2639,7 @@ FailureReportRes ::= SEQUENCE { -- gprs notification types NoteMsPresentForGprsArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, sgsn-Address [1] GSN-Address, ggsn-Address [2] GSN-Address OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, @@ -2663,8 +2666,8 @@ SendingNode-Number ::= CHOICE { css-Number [1] ISDN-AddressString} RestoreDataArg ::= SEQUENCE { - imsi IMSI, - lmsi LMSI OPTIONAL, + imsi IMSI, + lmsi LMSI OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ... , vlr-Capability [6] VLR-Capability OPTIONAL, @@ -2673,16 +2676,16 @@ RestoreDataArg ::= SEQUENCE { RestoreDataRes ::= SEQUENCE { hlr-Number ISDN-AddressString, - msNotReachable NULL OPTIONAL, + msNotReachable NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ...} -- VBS/VGCS types VBSDataList ::= SEQUENCE SIZE (1..maxNumOfVBSGroupIds) OF - VoiceBroadcastData + VoiceBroadcastData VGCSDataList ::= SEQUENCE SIZE (1..maxNumOfVGCSGroupIds) OF - VoiceGroupCallData + VoiceGroupCallData maxNumOfVBSGroupIds INTEGER ::= 50 @@ -2713,7 +2716,7 @@ AdditionalSubscriptions ::= BIT STRING { VoiceBroadcastData ::= SEQUENCE { groupid GroupId, -- groupId shall be filled with six TBCD fillers (1111)if the longGroupId is present - broadcastInitEntitlement NULL OPTIONAL, + broadcastInitEntitlement NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., longGroupId [0] Long-GroupId OPTIONAL } @@ -2758,7 +2761,7 @@ SubscriberInfo ::= SEQUENCE { ... , locationInformationGPRS [3] LocationInformationGPRS OPTIONAL, ps-SubscriberState [4] PS-SubscriberState OPTIONAL, - imei [5] IMEI OPTIONAL, + imei [5] IMEI OPTIONAL, ms-Classmark2 [6] MS-Classmark2 OPTIONAL, gprs-MS-Class [7] GPRSMSClass OPTIONAL, mnpInfoRes [8] MNPInfoRes OPTIONAL, @@ -2768,7 +2771,8 @@ SubscriberInfo ::= SEQUENCE { eps-SubscriberState [12] PS-SubscriberState OPTIONAL, locationInformationEPS [13] LocationInformationEPS OPTIONAL, timeZone [14] TimeZone OPTIONAL, - daylightSavingTime [15] DaylightSavingTime OPTIONAL } + daylightSavingTime [15] DaylightSavingTime OPTIONAL, + locationInformation5GS [16] LocationInformation5GS OPTIONAL } -- If the HLR receives locationInformation, subscriberState or ms-Classmark2 from an SGSN or -- MME (via an IWF), it shall discard them. @@ -2776,6 +2780,7 @@ SubscriberInfo ::= SEQUENCE { -- locationInformationEPS (outside the locationInformation IE) from a VLR, it shall -- discard them. -- If the HLR receives parameters which it has not requested, it shall discard them. +-- The locationInformation5GS IE should be absent if UE did not access via 5GS and IM-SSF. IMS-VoiceOverPS-SessionsInd ::= ENUMERATED { imsVoiceOverPS-SessionsNotSupported (0), @@ -2796,7 +2801,7 @@ DaylightSavingTime ::= ENUMERATED { MNPInfoRes ::= SEQUENCE { routeingNumber [0] RouteingNumber OPTIONAL, - imsi [1] IMSI OPTIONAL, + imsi [1] IMSI OPTIONAL, msisdn [2] ISDN-AddressString OPTIONAL, numberPortabilityStatus [3] NumberPortabilityStatus OPTIONAL, extensionContainer [4] ExtensionContainer OPTIONAL, @@ -2846,7 +2851,7 @@ RequestedInfo ::= SEQUENCE { ..., currentLocation [3] NULL OPTIONAL, requestedDomain [4] DomainType OPTIONAL, - imei [6] NULL OPTIONAL, + imei [6] NULL OPTIONAL, ms-classmark [5] NULL OPTIONAL, mnpRequestedInfo [7] NULL OPTIONAL, locationInformationEPS-Supported [11] NULL OPTIONAL, @@ -2891,8 +2896,7 @@ LocationInformation ::= SEQUENCE { currentLocationRetrieved [8] NULL OPTIONAL, sai-Present [9] NULL OPTIONAL, locationInformationEPS [10] LocationInformationEPS OPTIONAL, - userCSGInformation [11] UserCSGInformation OPTIONAL, - locationInformation5GS [12] LocationInformation5GS OPTIONAL } + userCSGInformation [11] UserCSGInformation OPTIONAL } -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains -- a Service Area Identity. -- currentLocationRetrieved shall be present @@ -2906,7 +2910,6 @@ LocationInformation ::= SEQUENCE { -- the case the Access mode is Hybrid Mode. -- The locationInformationEPS IE should be absent if locationInformationEPS-Supported was not -- received in the RequestedInfo IE. --- The locationInformation5GS IE should be absent if UE did not access via 5GS and IM-SSF. LocationInformationEPS ::= SEQUENCE { e-utranCellGlobalIdentity [0] E-UTRAN-CGI OPTIONAL, @@ -2914,7 +2917,7 @@ LocationInformationEPS ::= SEQUENCE { extensionContainer [2] ExtensionContainer OPTIONAL, geographicalInformation [3] GeographicalInformation OPTIONAL, geodeticInformation [4] GeodeticInformation OPTIONAL, - currentLocationRetrieved [5] NULL OPTIONAL, + currentLocationRetrieved [5] NULL OPTIONAL, ageOfLocationInformation [6] AgeOfLocationInformation OPTIONAL, ..., mme-Name [7] DiameterIdentity OPTIONAL } @@ -2948,15 +2951,17 @@ LocationInformation5GS ::= SEQUENCE { e-utranCellGlobalIdentity [1] E-UTRAN-CGI OPTIONAL, geographicalInformation [2] GeographicalInformation OPTIONAL, geodeticInformation [3] GeodeticInformation OPTIONAL, - amf-address [4] FQDN OPTIONAL, - trackingAreaIdentity [5] TA-Id OPTIONAL, - currentLocationRetrieved [6] NULL OPTIONAL, + amf-address [4] FQDN OPTIONAL, + trackingAreaIdentity [5] TA-Id OPTIONAL, + currentLocationRetrieved [6] NULL OPTIONAL, ageOfLocationInformation [7] AgeOfLocationInformation OPTIONAL, vplmnId [8] PLMN-Id OPTIONAL, localtimeZone [9] TimeZone OPTIONAL, rat-Type [10] Used-RAT-Type OPTIONAL, extensionContainer [11] ExtensionContainer OPTIONAL, - ...} + ..., + nrTrackingAreaIdentity [12] NR-TA-Id OPTIONAL + } -- currentLocationRetrieved shall be present if the location information -- was retrieved after successful paging. @@ -2966,7 +2971,7 @@ UserCSGInformation ::= SEQUENCE { extensionContainer [1] ExtensionContainer OPTIONAL, ..., accessMode [2] OCTET STRING (SIZE(1)) OPTIONAL, - cmi [3] OCTET STRING (SIZE(1)) OPTIONAL } + cmi [3] OCTET STRING (SIZE(1)) OPTIONAL } -- The encoding of the accessMode and cmi parameters are as defined in 3GPP TS 29.060 [105]. GeographicalInformation ::= OCTET STRING (SIZE (8)) @@ -2975,9 +2980,9 @@ GeographicalInformation ::= OCTET STRING (SIZE (8)) -- as specified in 3GPP TS 23.032 is allowed to be used -- The internal structure according to 3GPP TS 23.032 is as follows: -- Type of shape (ellipsoid point with uncertainty circle) 1 octet --- Degrees of Latitude 3 octets --- Degrees of Longitude 3 octets --- Uncertainty code 1 octet +-- Degrees of Latitude 3 octets +-- Degrees of Longitude 3 octets +-- Uncertainty code 1 octet GeodeticInformation ::= OCTET STRING (SIZE (10)) -- Refers to Calling Geodetic Location defined in Q.763 (1999). @@ -2986,10 +2991,10 @@ GeodeticInformation ::= OCTET STRING (SIZE (10)) -- The internal structure according to Q.763 (1999) is as follows: -- Screening and presentation indicators 1 octet -- Type of shape (ellipsoid point with uncertainty circle) 1 octet --- Degrees of Latitude 3 octets --- Degrees of Longitude 3 octets --- Uncertainty code 1 octet --- Confidence 1 octet +-- Degrees of Latitude 3 octets +-- Degrees of Longitude 3 octets +-- Uncertainty code 1 octet +-- Confidence 1 octet LocationNumber ::= OCTET STRING (SIZE (2..10)) -- the internal structure is defined in ITU-T Rec Q.763 @@ -3010,7 +3015,7 @@ PS-SubscriberState ::= CHOICE { netDetNotReachable NotReachableReason } PDP-ContextInfoList ::= SEQUENCE SIZE (1..maxNumOfPDP-Contexts) OF - PDP-ContextInfo + PDP-ContextInfo PDP-ContextInfo ::= SEQUENCE { pdp-ContextIdentifier [0] ContextId, @@ -3135,7 +3140,7 @@ CallWaitingData ::= SEQUENCE { ... } Ext-CwFeatureList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF - Ext-CwFeature + Ext-CwFeature Ext-CwFeature ::= SEQUENCE { basicService [1] Ext-BasicServiceCode, @@ -3166,15 +3171,15 @@ EctData ::= SEQUENCE { RequestedSubscriptionInfo ::= SEQUENCE { requestedSS-Info [1] SS-ForBS-Code OPTIONAL, - odb [2] NULL OPTIONAL, + odb [2] NULL OPTIONAL, requestedCAMEL-SubscriptionInfo [3] RequestedCAMEL-SubscriptionInfo OPTIONAL, supportedVLR-CAMEL-Phases [4] NULL OPTIONAL, supportedSGSN-CAMEL-Phases [5] NULL OPTIONAL, extensionContainer [6] ExtensionContainer OPTIONAL, ..., additionalRequestedCAMEL-SubscriptionInfo - [7] AdditionalRequestedCAMEL-SubscriptionInfo - OPTIONAL, + [7] AdditionalRequestedCAMEL-SubscriptionInfo + OPTIONAL, msisdn-BS-List [8] NULL OPTIONAL, csg-SubscriptionDataRequested [9] NULL OPTIONAL, cw-Info [10] NULL OPTIONAL, @@ -3184,13 +3189,13 @@ RequestedSubscriptionInfo ::= SEQUENCE { ect-Info [14] NULL OPTIONAL } MSISDN-BS-List ::= SEQUENCE SIZE (1..maxNumOfMSISDN) OF - MSISDN-BS + MSISDN-BS maxNumOfMSISDN INTEGER ::= 50 MSISDN-BS ::= SEQUENCE { - msisdn ISDN-AddressString, + msisdn ISDN-AddressString, basicServiceList [0] BasicServiceList OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ...} @@ -3217,7 +3222,7 @@ AdditionalRequestedCAMEL-SubscriptionInfo ::= ENUMERATED { CallForwardingData ::= SEQUENCE { forwardingFeatureList Ext-ForwFeatureList, - notificationToCSE NULL OPTIONAL, + notificationToCSE NULL OPTIONAL, extensionContainer [0] ExtensionContainer OPTIONAL, ...} @@ -3225,7 +3230,7 @@ CallBarringData ::= SEQUENCE { callBarringFeatureList Ext-CallBarFeatureList, password Password OPTIONAL, wrongPasswordAttemptsCounter WrongPasswordAttemptsCounter OPTIONAL, - notificationToCSE NULL OPTIONAL, + notificationToCSE NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ...} @@ -3233,7 +3238,7 @@ WrongPasswordAttemptsCounter ::= INTEGER (0..4) ODB-Info ::= SEQUENCE { odb-Data ODB-Data, - notificationToCSE NULL OPTIONAL, + notificationToCSE NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ...} @@ -3378,8 +3383,8 @@ ModificationRequestFor-CSI ::= SEQUENCE { extensionContainer [3] ExtensionContainer OPTIONAL, ..., additionalRequestedCAMEL-SubscriptionInfo - [4] AdditionalRequestedCAMEL-SubscriptionInfo - OPTIONAL } + [4] AdditionalRequestedCAMEL-SubscriptionInfo + OPTIONAL } -- requestedCamel-SubscriptionInfo shall be discarded if -- additionalRequestedCAMEL-SubscriptionInfo is received @@ -3398,7 +3403,7 @@ ModificationInstruction ::= ENUMERATED { -- subscriber data modification notification types NoteSubscriberDataModifiedArg ::= SEQUENCE { - imsi IMSI, + imsi IMSI, msisdn ISDN-AddressString, forwardingInfoFor-CSE [0] Ext-ForwardingInfoFor-CSE OPTIONAL, callBarringInfoFor-CSE [1] Ext-CallBarringInfoFor-CSE OPTIONAL, @@ -3424,7 +3429,7 @@ NoteSubscriberDataModifiedRes ::= SEQUENCE { NoteMM-EventArg::= SEQUENCE { serviceKey ServiceKey, eventMet [0] MM-Code, - imsi [1] IMSI, + imsi [1] IMSI, msisdn [2] ISDN-AddressString, locationInformation [3] LocationInformation OPTIONAL, supportedCAMELPhases [5] SupportedCamelPhases OPTIONAL, @@ -3462,7 +3467,7 @@ Ext-CallBarringInfoFor-CSE ::= SEQUENCE { -- vcsg location registration types UpdateVcsgLocationArg ::= SEQUENCE { - imsi IMSI, + imsi IMSI, msisdn [2] ISDN-AddressString OPTIONAL, vlr-Number [0] ISDN-AddressString OPTIONAL, sgsn-Number [1] ISDN-AddressString OPTIONAL, @@ -3486,3 +3491,4 @@ CancelVcsgLocationRes ::= SEQUENCE { END + diff --git a/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn index dad561ca64..126bd951e6 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn @@ -1,10 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.6.1 Mobile Service Operations - MAP-MobileServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-MobileServiceOperations (5) - version18 (18)} + version20 (20)} DEFINITIONS @@ -113,7 +112,7 @@ joint-iso-itu-t remote-operations(4) FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} UpdateLocationArg, UpdateLocationRes, @@ -172,14 +171,14 @@ PrepareSubsequentHO-Res, FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version18 (18)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version20 (20)} ; -- location registration operations -updateLocation OPERATION ::= { --Timer m +updateLocation OPERATION ::= { --Timer m ARGUMENT UpdateLocationArg RESULT @@ -192,30 +191,30 @@ updateLocation OPERATION ::= { --Timer m roamingNotAllowed} CODE local:2 } -cancelLocation OPERATION ::= { --Timer m +cancelLocation OPERATION ::= { --Timer m ARGUMENT CancelLocationArg RESULT CancelLocationRes - -- optional + -- optional ERRORS { dataMissing | unexpectedDataValue} CODE local:3 } -purgeMS OPERATION ::= { --Timer m +purgeMS OPERATION ::= { --Timer m ARGUMENT PurgeMS-Arg RESULT PurgeMS-Res - -- optional + -- optional ERRORS{ dataMissing | unexpectedDataValue| unknownSubscriber} CODE local:67 } -sendIdentification OPERATION ::= { --Timer s +sendIdentification OPERATION ::= { --Timer s ARGUMENT SendIdentificationArg RESULT @@ -227,7 +226,7 @@ sendIdentification OPERATION ::= { --Timer s -- gprs location registration operations -updateGprsLocation OPERATION ::= { --Timer m +updateGprsLocation OPERATION ::= { --Timer m ARGUMENT UpdateGprsLocationArg RESULT @@ -241,7 +240,7 @@ updateGprsLocation OPERATION ::= { --Timer m -- subscriber information enquiry operations -provideSubscriberInfo OPERATION ::= { --Timer m +provideSubscriberInfo OPERATION ::= { --Timer m ARGUMENT ProvideSubscriberInfoArg RESULT @@ -253,7 +252,7 @@ provideSubscriberInfo OPERATION ::= { --Timer m -- any time information enquiry operations -anyTimeInterrogation OPERATION ::= { --Timer m +anyTimeInterrogation OPERATION ::= { --Timer m ARGUMENT AnyTimeInterrogationArg RESULT @@ -268,7 +267,7 @@ anyTimeInterrogation OPERATION ::= { --Timer m -- any time information handling operations -anyTimeSubscriptionInterrogation OPERATION ::= { --Timer m +anyTimeSubscriptionInterrogation OPERATION ::= { --Timer m ARGUMENT AnyTimeSubscriptionInterrogationArg RESULT @@ -286,7 +285,7 @@ anyTimeSubscriptionInterrogation OPERATION ::= { --Timer m informationNotAvailable} CODE local:62 } -anyTimeModification OPERATION ::= { --Timer m +anyTimeModification OPERATION ::= { --Timer m ARGUMENT AnyTimeModificationArg RESULT @@ -308,12 +307,12 @@ anyTimeModification OPERATION ::= { --Timer m -- subscriber data modification notification operations -noteSubscriberDataModified OPERATION ::= { --Timer m +noteSubscriberDataModified OPERATION ::= { --Timer m ARGUMENT NoteSubscriberDataModifiedArg RESULT NoteSubscriberDataModifiedRes - -- optional + -- optional ERRORS { dataMissing | unexpectedDataValue | @@ -322,7 +321,7 @@ noteSubscriberDataModified OPERATION ::= { --Timer m -- handover operations -prepareHandover OPERATION ::= { --Timer m +prepareHandover OPERATION ::= { --Timer m ARGUMENT PrepareHO-Arg RESULT @@ -335,24 +334,24 @@ prepareHandover OPERATION ::= { --Timer m targetCellOutsideGroupCallArea } CODE local:68 } -sendEndSignal OPERATION ::= { --Timer l +sendEndSignal OPERATION ::= { --Timer l ARGUMENT SendEndSignal-Arg RESULT SendEndSignal-Res CODE local:29 } -processAccessSignalling OPERATION ::= { --Timer s +processAccessSignalling OPERATION ::= { --Timer s ARGUMENT ProcessAccessSignalling-Arg CODE local:33 } -forwardAccessSignalling OPERATION ::= { --Timer s +forwardAccessSignalling OPERATION ::= { --Timer s ARGUMENT ForwardAccessSignalling-Arg CODE local:34 } -prepareSubsequentHandover OPERATION ::= { --Timer m +prepareSubsequentHandover OPERATION ::= { --Timer m ARGUMENT PrepareSubsequentHO-Arg RESULT @@ -366,7 +365,7 @@ prepareSubsequentHandover OPERATION ::= { --Timer m -- authentication management operations -sendAuthenticationInfo OPERATION ::= { --Timer m +sendAuthenticationInfo OPERATION ::= { --Timer m ARGUMENT SendAuthenticationInfoArg -- optional @@ -384,7 +383,7 @@ sendAuthenticationInfo OPERATION ::= { --Timer m unknownSubscriber} CODE local:56 } -authenticationFailureReport OPERATION ::= { --Timer m +authenticationFailureReport OPERATION ::= { --Timer m ARGUMENT AuthenticationFailureReportArg RESULT @@ -398,7 +397,7 @@ authenticationFailureReport OPERATION ::= { --Timer m -- IMEI management operations -checkIMEI OPERATION ::= { --Timer m +checkIMEI OPERATION ::= { --Timer m ARGUMENT CheckIMEI-Arg RESULT @@ -411,7 +410,7 @@ checkIMEI OPERATION ::= { --Timer m -- subscriber management operations -insertSubscriberData OPERATION ::= { --Timer m +insertSubscriberData OPERATION ::= { --Timer m ARGUMENT InsertSubscriberDataArg RESULT @@ -423,7 +422,7 @@ insertSubscriberData OPERATION ::= { --Timer m unidentifiedSubscriber} CODE local:7 } -deleteSubscriberData OPERATION ::= { --Timer m +deleteSubscriberData OPERATION ::= { --Timer m ARGUMENT DeleteSubscriberDataArg RESULT @@ -437,15 +436,15 @@ deleteSubscriberData OPERATION ::= { --Timer m -- fault recovery operations -reset OPERATION ::= { --Timer m +reset OPERATION ::= { --Timer m ARGUMENT ResetArg CODE local:37 } -forwardCheckSS-Indication OPERATION ::= { --Timer s +forwardCheckSS-Indication OPERATION ::= { --Timer s CODE local:38 } -restoreData OPERATION ::= { --Timer m +restoreData OPERATION ::= { --Timer m ARGUMENT RestoreDataArg RESULT @@ -459,7 +458,7 @@ restoreData OPERATION ::= { --Timer m -- gprs location information retrieval operations -sendRoutingInfoForGprs OPERATION ::= { --Timer m +sendRoutingInfoForGprs OPERATION ::= { --Timer m ARGUMENT SendRoutingInfoForGprsArg RESULT @@ -475,12 +474,12 @@ sendRoutingInfoForGprs OPERATION ::= { --Timer m -- failure reporting operations -failureReport OPERATION ::= { --Timer m +failureReport OPERATION ::= { --Timer m ARGUMENT FailureReportArg RESULT FailureReportRes - -- optional + -- optional ERRORS { systemFailure | dataMissing | @@ -490,12 +489,12 @@ failureReport OPERATION ::= { --Timer m -- gprs notification operations -noteMsPresentForGprs OPERATION ::= { --Timer m +noteMsPresentForGprs OPERATION ::= { --Timer m ARGUMENT NoteMsPresentForGprsArg RESULT NoteMsPresentForGprsRes - -- optional + -- optional ERRORS { systemFailure | dataMissing | @@ -503,7 +502,7 @@ noteMsPresentForGprs OPERATION ::= { --Timer m unknownSubscriber} CODE local:26 } -noteMM-Event OPERATION ::= { --Timer m +noteMM-Event OPERATION ::= { --Timer m ARGUMENT NoteMM-EventArg RESULT @@ -517,7 +516,7 @@ noteMM-Event OPERATION ::= { --Timer m -- vcsg location registration operations -updateVcsgLocation OPERATION ::= { --Timer m +updateVcsgLocation OPERATION ::= { --Timer m ARGUMENT UpdateVcsgLocationArg RESULT @@ -528,12 +527,12 @@ updateVcsgLocation OPERATION ::= { --Timer m unknownSubscriber} CODE local:53 } -cancelVcsgLocation OPERATION ::= { --Timer m +cancelVcsgLocation OPERATION ::= { --Timer m ARGUMENT CancelVcsgLocationArg RESULT CancelVcsgLocationRes - -- optional + -- optional ERRORS { dataMissing | unexpectedDataValue} diff --git a/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn index 030350226c..8db86101d5 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn @@ -1,9 +1,9 @@ -- 17.7.2 Operation and maintenance data types --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version18 (18)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version20 (20)} DEFINITIONS @@ -33,17 +33,17 @@ IMPORTS PLMN-Id FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; ActivateTraceModeArg ::= SEQUENCE { - imsi [0] IMSI OPTIONAL, + imsi [0] IMSI OPTIONAL, traceReference [1] TraceReference, traceType [2] TraceType, omc-Id [3] AddressString OPTIONAL, @@ -82,7 +82,7 @@ MDT-Configuration ::= SEQUENCE { mdt-Allowed-PLMN-List [14] MDT-Allowed-PLMNId-List OPTIONAL } MDT-Allowed-PLMNId-List ::= SEQUENCE SIZE (1..16) OF - PLMN-Id + PLMN-Id PeriodUMTS ::= ENUMERATED { d250ms (0), d500ms (1), @@ -137,19 +137,19 @@ AreaScope ::= SEQUENCE { ... } CGI-List ::= SEQUENCE SIZE (1..32) OF - GlobalCellId + GlobalCellId E-UTRAN-CGI-List ::= SEQUENCE SIZE (1..32) OF - E-UTRAN-CGI + E-UTRAN-CGI RoutingAreaId-List ::= SEQUENCE SIZE (1..8) OF - RAIdentity + RAIdentity LocationAreaId-List ::= SEQUENCE SIZE (1..8) OF - LAIFixedLength + LAIFixedLength TrackingAreaId-List ::= SEQUENCE SIZE (1..8) OF - TA-Id + TA-Id ListOfMeasurements ::= OCTET STRING (SIZE (4)) -- Octets are coded as described in 3GPP TS 32.422. @@ -478,7 +478,7 @@ ActivateTraceModeRes ::= SEQUENCE { } DeactivateTraceModeArg ::= SEQUENCE { - imsi [0] IMSI OPTIONAL, + imsi [0] IMSI OPTIONAL, traceReference [1] TraceReference, extensionContainer [2] ExtensionContainer OPTIONAL, ..., diff --git a/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn index 921c6b0961..1e60e510d2 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) --17.6.2 Operation and Maintenance Operations MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-OperationAndMaintenanceOperations (6) - version18 (18)} + version20 (20)} DEFINITIONS @@ -32,7 +32,7 @@ joint-iso-itu-t remote-operations(4) tracingBufferFull FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} ActivateTraceModeArg, ActivateTraceModeRes, @@ -40,17 +40,17 @@ FROM MAP-Errors { DeactivateTraceModeRes FROM MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version18 (18)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version20 (20)} ISDN-AddressString, IMSI FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} ; -activateTraceMode OPERATION ::= { --Timer m +activateTraceMode OPERATION ::= { --Timer m ARGUMENT ActivateTraceModeArg RESULT @@ -65,7 +65,7 @@ activateTraceMode OPERATION ::= { --Timer m tracingBufferFull} CODE local:50 } -deactivateTraceMode OPERATION ::= { --Timer m +deactivateTraceMode OPERATION ::= { --Timer m ARGUMENT DeactivateTraceModeArg RESULT @@ -79,7 +79,7 @@ deactivateTraceMode OPERATION ::= { --Timer m unidentifiedSubscriber} CODE local:51 } -sendIMSI OPERATION ::= { --Timer m +sendIMSI OPERATION ::= { --Timer m ARGUMENT ISDN-AddressString RESULT diff --git a/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn b/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn index 73bf636459..b6163266c3 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) --17.5 MAP operation and error codes MAP-Protocol { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Protocol (4) version18 (18)} + gsm-Network (1) modules (3) map-Protocol (4) version20 (20)} DEFINITIONS @@ -50,7 +50,7 @@ authenticationFailureReport, FROM MAP-MobileServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-MobileServiceOperations (5) - version18 (18)} + version20 (20)} activateTraceMode, deactivateTraceMode, @@ -58,7 +58,7 @@ FROM MAP-MobileServiceOperations { FROM MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-OperationAndMaintenanceOperations (6) - version18 (18)} + version20 (20)} sendRoutingInfo, provideRoamingNumber, @@ -72,7 +72,7 @@ FROM MAP-OperationAndMaintenanceOperations { FROM MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CallHandlingOperations (7) - version18 (18)} + version20 (20)} registerSS, eraseSS, @@ -90,7 +90,7 @@ FROM MAP-CallHandlingOperations { FROM MAP-SupplementaryServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-SupplementaryServiceOperations (8) - version18 (18)} + version20 (20)} sendRoutingInfoForSM, mo-ForwardSM, @@ -103,7 +103,7 @@ FROM MAP-SupplementaryServiceOperations { FROM MAP-ShortMessageServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-ShortMessageServiceOperations (9) - version18 (18)} + version20 (20)} prepareGroupCall, processGroupCallSignalling, @@ -113,7 +113,7 @@ FROM MAP-ShortMessageServiceOperations { FROM MAP-Group-Call-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Group-Call-Operations (22) - version18 (18)} + version20 (20)} provideSubscriberLocation, sendRoutingInfoForLCS, @@ -121,7 +121,7 @@ FROM MAP-Group-Call-Operations { FROM MAP-LocationServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-LocationServiceOperations (24) - version18 (18)} + version20 (20)} ; @@ -175,4 +175,3 @@ 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 c4673c1196..b269b3e51f 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.6 Short message data types MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version18 (18)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version20 (20)} DEFINITIONS @@ -46,17 +46,17 @@ IMPORTS FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} AbsentSubscriberDiagnosticSM FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version18 (18)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} ; @@ -73,11 +73,11 @@ RoutingInfoForSM-Arg ::= SEQUENCE { sm-RP-SMEA [9] SM-RP-SMEA OPTIONAL, sm-deliveryNotIntended [10] SM-DeliveryNotIntended OPTIONAL, ip-sm-gwGuidanceIndicator [11] NULL OPTIONAL, - imsi [12] IMSI OPTIONAL, + imsi [12] IMSI OPTIONAL, t4-Trigger-Indicator [14] NULL OPTIONAL, singleAttemptDelivery [13] NULL OPTIONAL, correlationID [15] CorrelationID OPTIONAL, - smsf-supportIndicator [16] NULL OPTIONAL } + smsf-supportIndicator [16] NULL OPTIONAL } SM-DeliveryNotIntended ::= ENUMERATED { onlyIMSI-requested (0), @@ -98,7 +98,7 @@ SM-RP-SMEA ::= OCTET STRING (SIZE (1..12)) -- address-value RoutingInfoForSM-Res ::= SEQUENCE { - imsi IMSI, + imsi IMSI, locationInfoWithLMSI [0] LocationInfoWithLMSI, extensionContainer [4] ExtensionContainer OPTIONAL, ..., @@ -112,7 +112,7 @@ IP-SM-GW-Guidance ::= SEQUENCE { LocationInfoWithLMSI ::= SEQUENCE { networkNode-Number [1] ISDN-AddressString, - lmsi LMSI OPTIONAL, + lmsi LMSI OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., gprsNodeIndicator [5] NULL OPTIONAL, @@ -130,8 +130,8 @@ LocationInfoWithLMSI ::= SEQUENCE { 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 + 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 @@ -165,7 +165,7 @@ 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 } @@ -179,11 +179,11 @@ MT-ForwardSM-Arg ::= SEQUENCE { sm-RP-DA SM-RP-DA, sm-RP-OA SM-RP-OA, sm-RP-UI SignalInfo, - moreMessagesToSend NULL OPTIONAL, + moreMessagesToSend NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., smDeliveryTimer SM-DeliveryTimerValue OPTIONAL, - smDeliveryStartTime Time OPTIONAL, + smDeliveryStartTime Time OPTIONAL, smsOverIP-OnlyIndicator [0] NULL OPTIONAL, correlationID [1] CorrelationID OPTIONAL, maximumRetransmissionTime [2] Time OPTIONAL, @@ -205,8 +205,8 @@ MT-ForwardSM-Res ::= SEQUENCE { ... } SM-RP-DA ::= CHOICE { - imsi [0] IMSI, - lmsi [1] LMSI, + imsi [0] IMSI, + lmsi [1] LMSI, serviceCentreAddressDA [4] AddressString, noSM-RP-DA [5] NULL} @@ -222,7 +222,7 @@ ReportSM-DeliveryStatusArg ::= SEQUENCE { serviceCentreAddress AddressString, sm-DeliveryOutcome SM-DeliveryOutcome, absentSubscriberDiagnosticSM [0] AbsentSubscriberDiagnosticSM - OPTIONAL, + OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ..., gprsSupportIndicator [2] NULL OPTIONAL, @@ -249,10 +249,10 @@ ReportSM-DeliveryStatusArg ::= SEQUENCE { -- If received ip-sm-gw-sm-absentSubscriberDiagnosticSM is for delivery via IMS -- If ip-sm-gw-Indicator is set, then ip-sm-gw-sm-absentSubscriberDiagnosticSM -- shall be absent - imsi [9] IMSI OPTIONAL, + imsi [9] IMSI OPTIONAL, singleAttemptDelivery [10] NULL OPTIONAL, correlationID [11] CorrelationID OPTIONAL, - smsf-3gpp-deliveryOutcomeIndicator [12] NULL 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, @@ -287,9 +287,9 @@ AlertServiceCentreArg ::= SEQUENCE { msisdn ISDN-AddressString, serviceCentreAddress AddressString, ..., - imsi IMSI OPTIONAL, + imsi IMSI OPTIONAL, correlationID CorrelationID OPTIONAL, - maximumUeAvailabilityTime [0] Time OPTIONAL, + maximumUeAvailabilityTime [0] Time OPTIONAL, smsGmscAlertEvent [1] SmsGmsc-Alert-Event OPTIONAL, smsGmscDiameterAddress [2] NetworkNodeDiameterAddress OPTIONAL, newSGSNNumber [3] ISDN-AddressString OPTIONAL, @@ -308,24 +308,28 @@ InformServiceCentreArg ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, ... , absentSubscriberDiagnosticSM AbsentSubscriberDiagnosticSM OPTIONAL, - additionalAbsentSubscriberDiagnosticSM [0] AbsentSubscriberDiagnosticSM OPTIONAL } + additionalAbsentSubscriberDiagnosticSM [0] AbsentSubscriberDiagnosticSM OPTIONAL, -- additionalAbsentSubscriberDiagnosticSM may be present only if -- absentSubscriberDiagnosticSM is present. -- if included, additionalAbsentSubscriberDiagnosticSM is for GPRS and -- absentSubscriberDiagnosticSM is for non-GPRS + smsf3gppAbsentSubscriberDiagnosticSM [1] AbsentSubscriberDiagnosticSM OPTIONAL, + smsfNon3gppAbsentSubscriberDiagnosticSM [2] AbsentSubscriberDiagnosticSM OPTIONAL } MW-Status ::= BIT STRING { sc-AddressNotIncluded (0), mnrf-Set (1), mcef-Set (2) , - mnrg-Set (3)} (SIZE (6..16)) + mnrg-Set (3), + mnr5g-Set (4), + mnr5gn3g-Set (5)} (SIZE (6..16)) -- exception handling: - -- bits 4 to 15 shall be ignored if received and not understood + -- bits 6 to 15 shall be ignored if received and not understood ReadyForSM-Arg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, alertReason AlertReason, - alertReasonIndicator NULL OPTIONAL, + alertReasonIndicator NULL OPTIONAL, -- alertReasonIndicator is set only when the alertReason -- sent to HLR is for GPRS extensionContainer ExtensionContainer OPTIONAL, @@ -333,7 +337,7 @@ ReadyForSM-Arg ::= SEQUENCE { additionalAlertReasonIndicator [1] NULL OPTIONAL, -- additionalAlertReasonIndicator is set only when the alertReason -- sent to HLR is for IP-SM-GW - maximumUeAvailabilityTime Time OPTIONAL } + maximumUeAvailabilityTime Time OPTIONAL } ReadyForSM-Res ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, @@ -353,7 +357,7 @@ MT-ForwardSM-VGCS-Arg ::= SEQUENCE { MT-ForwardSM-VGCS-Res ::= SEQUENCE { sm-RP-UI [0] SignalInfo OPTIONAL, dispatcherList [1] DispatcherList OPTIONAL, - ongoingCall NULL OPTIONAL, + ongoingCall NULL OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ..., additionalDispatcherList [3] AdditionalDispatcherList OPTIONAL } @@ -362,13 +366,13 @@ MT-ForwardSM-VGCS-Res ::= SEQUENCE { DispatcherList ::= SEQUENCE SIZE (1..maxNumOfDispatchers) OF - ISDN-AddressString + ISDN-AddressString maxNumOfDispatchers INTEGER ::= 5 AdditionalDispatcherList ::= SEQUENCE SIZE (1..maxNumOfAdditionalDispatchers) OF - ISDN-AddressString + ISDN-AddressString maxNumOfAdditionalDispatchers INTEGER ::= 15 diff --git a/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn index 37feeb308f..74b347a726 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.5 Supplementary service codes MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version18 (18)} + gsm-Network (1) modules (3) map-SS-Code (15) version20 (20)} DEFINITIONS @@ -21,28 +21,28 @@ SS-Code ::= OCTET STRING (SIZE (1)) -- bits 87654321: group (bits 8765), and specific service -- (bits 4321) -allSS SS-Code ::= '00000000'B +allSS SS-Code ::= '00000000'B -- reserved for possible future use -- all SS allLineIdentificationSS SS-Code ::= '00010000'B -- reserved for possible future use -- all line identification SS -clip SS-Code ::= '00010001'B +clip SS-Code ::= '00010001'B -- calling line identification presentation -clir SS-Code ::= '00010010'B +clir SS-Code ::= '00010010'B -- calling line identification restriction -colp SS-Code ::= '00010011'B +colp SS-Code ::= '00010011'B -- connected line identification presentation -colr SS-Code ::= '00010100'B +colr SS-Code ::= '00010100'B -- connected line identification restriction -mci SS-Code ::= '00010101'B +mci SS-Code ::= '00010101'B -- reserved for possible future use -- malicious call identification allNameIdentificationSS SS-Code ::= '00011000'B -- all name identification SS -cnap SS-Code ::= '00011001'B +cnap SS-Code ::= '00011001'B -- calling name presentation -- SS-Codes '00011010'B to '00011111'B are reserved for future @@ -50,91 +50,91 @@ cnap SS-Code ::= '00011001'B allForwardingSS SS-Code ::= '00100000'B -- all forwarding SS -cfu SS-Code ::= '00100001'B +cfu SS-Code ::= '00100001'B -- call forwarding unconditional allCondForwardingSS SS-Code ::= '00101000'B -- all conditional forwarding SS -cfb SS-Code ::= '00101001'B +cfb SS-Code ::= '00101001'B -- call forwarding on mobile subscriber busy -cfnry SS-Code ::= '00101010'B +cfnry SS-Code ::= '00101010'B -- call forwarding on no reply -cfnrc SS-Code ::= '00101011'B +cfnrc SS-Code ::= '00101011'B -- call forwarding on mobile subscriber not reachable -cd SS-Code ::= '00100100'B +cd SS-Code ::= '00100100'B -- call deflection allCallOfferingSS SS-Code ::= '00110000'B -- reserved for possible future use -- all call offering SS includes also all forwarding SS -ect SS-Code ::= '00110001'B +ect SS-Code ::= '00110001'B -- explicit call transfer -mah SS-Code ::= '00110010'B +mah SS-Code ::= '00110010'B -- reserved for possible future use -- mobile access hunting allCallCompletionSS SS-Code ::= '01000000'B -- reserved for possible future use -- all Call completion SS -cw SS-Code ::= '01000001'B +cw SS-Code ::= '01000001'B -- call waiting -hold SS-Code ::= '01000010'B +hold SS-Code ::= '01000010'B -- call hold -ccbs-A SS-Code ::= '01000011'B +ccbs-A SS-Code ::= '01000011'B -- completion of call to busy subscribers, originating side -- this SS-Code is used only in InsertSubscriberData, DeleteSubscriberData -- and InterrogateSS -ccbs-B SS-Code ::= '01000100'B +ccbs-B SS-Code ::= '01000100'B -- completion of call to busy subscribers, destination side -- this SS-Code is used only in InsertSubscriberData and DeleteSubscriberData -mc SS-Code ::= '01000101'B +mc SS-Code ::= '01000101'B -- multicall allMultiPartySS SS-Code ::= '01010000'B -- reserved for possible future use -- all multiparty SS -multiPTY SS-Code ::= '01010001'B +multiPTY SS-Code ::= '01010001'B -- multiparty allCommunityOfInterest-SS SS-Code ::= '01100000'B -- reserved for possible future use -- all community of interest SS -cug SS-Code ::= '01100001'B +cug SS-Code ::= '01100001'B -- closed user group allChargingSS SS-Code ::= '01110000'B -- reserved for possible future use -- all charging SS -aoci SS-Code ::= '01110001'B +aoci SS-Code ::= '01110001'B -- advice of charge information -aocc SS-Code ::= '01110010'B +aocc SS-Code ::= '01110010'B -- advice of charge charging allAdditionalInfoTransferSS SS-Code ::= '10000000'B -- reserved for possible future use -- all additional information transfer SS -uus1 SS-Code ::= '10000001'B +uus1 SS-Code ::= '10000001'B -- UUS1 user-to-user signalling -uus2 SS-Code ::= '10000010'B +uus2 SS-Code ::= '10000010'B -- UUS2 user-to-user signalling -uus3 SS-Code ::= '10000011'B +uus3 SS-Code ::= '10000011'B -- UUS3 user-to-user signalling allBarringSS SS-Code ::= '10010000'B -- all barring SS barringOfOutgoingCalls SS-Code ::= '10010001'B -- barring of outgoing calls -baoc SS-Code ::= '10010010'B +baoc SS-Code ::= '10010010'B -- barring of all outgoing calls -boic SS-Code ::= '10010011'B +boic SS-Code ::= '10010011'B -- barring of outgoing international calls -boicExHC SS-Code ::= '10010100'B +boicExHC SS-Code ::= '10010100'B -- barring of outgoing international calls except those directed -- to the home PLMN Country barringOfIncomingCalls SS-Code ::= '10011001'B -- barring of incoming calls -baic SS-Code ::= '10011010'B +baic SS-Code ::= '10011010'B -- barring of all incoming calls -bicRoam SS-Code ::= '10011011'B +bicRoam SS-Code ::= '10011011'B -- barring of incoming calls when roaming outside home PLMN -- Country @@ -158,12 +158,12 @@ plmn-specificSS-F SS-Code ::= '11111111'B allCallPrioritySS SS-Code ::= '10100000'B -- reserved for possible future use -- all call priority SS -emlpp SS-Code ::= '10100001'B +emlpp SS-Code ::= '10100001'B -- enhanced Multilevel Precedence Pre-emption (EMLPP) service allLCSPrivacyException SS-Code ::= '10110000'B -- all LCS Privacy Exception Classes -universal SS-Code ::= '10110001'B +universal SS-Code ::= '10110001'B -- allow location by any LCS client callSessionRelated SS-Code ::= '10110010'B -- allow location by any value added LCS client to which a call/session diff --git a/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn index 203690c747..d70a2497ee 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.4 Supplementary service data types MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version18 (18)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version20 (20)} DEFINITIONS @@ -57,17 +57,17 @@ IMPORTS ExternalSignalInfo FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version18 (18)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version20 (20)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version18 (18)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version20 (20)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version18 (18)} + gsm-Network (1) modules (3) map-SS-Code (15) version20 (20)} ; @@ -96,7 +96,7 @@ ForwardingInfo ::= SEQUENCE { ForwardingFeatureList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF - ForwardingFeature + ForwardingFeature ForwardingFeature ::= SEQUENCE { basicService BasicServiceCode OPTIONAL, @@ -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 { @@ -153,7 +153,7 @@ CallBarringInfo ::= SEQUENCE { ...} CallBarringFeatureList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF - CallBarringFeature + CallBarringFeature CallBarringFeature ::= SEQUENCE { basicService BasicServiceCode OPTIONAL, @@ -201,7 +201,7 @@ GenericServiceInfo ::= SEQUENCE { nbrSN [5] MC-Bearers OPTIONAL } CCBS-FeatureList ::= SEQUENCE SIZE (1..maxNumOfCCBS-Requests) OF - CCBS-Feature + CCBS-Feature maxNumOfCCBS-Requests INTEGER ::= 5 @@ -256,20 +256,20 @@ GuidanceInfo ::= ENUMERATED { -- specification. SS-List ::= SEQUENCE SIZE (1..maxNumOfSS) OF - SS-Code + SS-Code maxNumOfSS INTEGER ::= 30 SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF - SS-Info + SS-Info BasicServiceGroupList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF - BasicServiceCode + BasicServiceCode maxNumOfBasicServiceGroups INTEGER ::= 13 SS-InvocationNotificationArg ::= SEQUENCE { - imsi [0] IMSI, + imsi [0] IMSI, msisdn [1] ISDN-AddressString, ss-Event [2] SS-Code, -- The following SS-Code values are allowed : @@ -300,7 +300,7 @@ SS-InvocationNotificationRes ::= SEQUENCE { } SS-EventSpecification ::= SEQUENCE SIZE (1..maxEventSpecification) OF - AddressString + AddressString maxEventSpecification INTEGER ::= 2 diff --git a/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn index 716a3c4d44..ee54ce7844 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.6.5 Short message service operations MAP-ShortMessageServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-ShortMessageServiceOperations (9) - version18 (18)} + version20 (20)} DEFINITIONS @@ -45,7 +45,7 @@ joint-iso-itu-t remote-operations(4) absentSubscriberSM FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} RoutingInfoForSM-Arg, RoutingInfoForSM-Res, @@ -63,11 +63,11 @@ FROM MAP-Errors { MT-ForwardSM-VGCS-Res FROM MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version18 (18)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version20 (20)} ; -sendRoutingInfoForSM OPERATION ::= { --Timer m +sendRoutingInfoForSM OPERATION ::= { --Timer m ARGUMENT RoutingInfoForSM-Arg RESULT @@ -83,7 +83,7 @@ sendRoutingInfoForSM OPERATION ::= { --Timer m absentSubscriberSM} CODE local:45 } -mo-ForwardSM OPERATION ::= { --Timer ml +mo-ForwardSM OPERATION ::= { --Timer ml ARGUMENT MO-ForwardSM-Arg RESULT @@ -96,7 +96,7 @@ mo-ForwardSM OPERATION ::= { --Timer ml sm-DeliveryFailure} CODE local:46 } -mt-ForwardSM OPERATION ::= { --Timer ml +mt-ForwardSM OPERATION ::= { --Timer ml -- the timer value may be subject to negotiation between GMSC and IP-SM-GW ARGUMENT MT-ForwardSM-Arg @@ -116,7 +116,7 @@ mt-ForwardSM OPERATION ::= { --Timer ml absentSubscriberSM} CODE local:44 } -reportSM-DeliveryStatus OPERATION ::= { --Timer s +reportSM-DeliveryStatus OPERATION ::= { --Timer s ARGUMENT ReportSM-DeliveryStatusArg RESULT @@ -129,7 +129,7 @@ reportSM-DeliveryStatus OPERATION ::= { --Timer s messageWaitingListFull} CODE local:47 } -alertServiceCentre OPERATION ::= { --Timer s +alertServiceCentre OPERATION ::= { --Timer s ARGUMENT AlertServiceCentreArg RETURN RESULT TRUE @@ -139,12 +139,12 @@ alertServiceCentre OPERATION ::= { --Timer s unexpectedDataValue} CODE local:64 } -informServiceCentre OPERATION ::= { --Timer s +informServiceCentre OPERATION ::= { --Timer s ARGUMENT InformServiceCentreArg CODE local:63 } -readyForSM OPERATION ::= { --Timer m +readyForSM OPERATION ::= { --Timer m ARGUMENT ReadyForSM-Arg RESULT @@ -157,7 +157,7 @@ readyForSM OPERATION ::= { --Timer m unknownSubscriber} CODE local:66 } -mt-ForwardSM-VGCS OPERATION ::= { --Timer ml +mt-ForwardSM-VGCS OPERATION ::= { --Timer ml ARGUMENT MT-ForwardSM-VGCS-Arg RESULT @@ -170,3 +170,4 @@ mt-ForwardSM-VGCS OPERATION ::= { --Timer ml END + diff --git a/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn index be341763af..e5d7b8e9b9 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) --17.6.4 Supplementary service operations MAP-SupplementaryServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-SupplementaryServiceOperations (8) - version18 (18)} + version20 (20)} DEFINITIONS @@ -59,7 +59,7 @@ joint-iso-itu-t remote-operations(4) facilityNotSupported FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version18 (18)} + gsm-Network (1) modules (3) map-Errors (10) version20 (20)} RegisterSS-Arg, SS-Info, @@ -77,18 +77,18 @@ FROM MAP-Errors { EraseCC-EntryRes FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version18 (18)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version20 (20)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version18 (18)} + gsm-Network (1) modules (3) map-SS-Code (15) version20 (20)} ; -- supplementary service handling operations -registerSS OPERATION ::= { --Timer m +registerSS OPERATION ::= { --Timer m ARGUMENT RegisterSS-Arg RESULT @@ -106,7 +106,7 @@ registerSS OPERATION ::= { --Timer m ss-Incompatibility} CODE local:10 } -eraseSS OPERATION ::= { --Timer m +eraseSS OPERATION ::= { --Timer m ARGUMENT SS-ForBS-Code RESULT @@ -124,7 +124,7 @@ eraseSS OPERATION ::= { --Timer m } CODE local:11 } -activateSS OPERATION ::= { --Timer m +activateSS OPERATION ::= { --Timer m ARGUMENT SS-ForBS-Code RESULT @@ -145,7 +145,7 @@ activateSS OPERATION ::= { --Timer m numberOfPW-AttemptsViolation} CODE local:12 } -deactivateSS OPERATION ::= { --Timer m +deactivateSS OPERATION ::= { --Timer m ARGUMENT SS-ForBS-Code RESULT @@ -165,7 +165,7 @@ deactivateSS OPERATION ::= { --Timer m numberOfPW-AttemptsViolation} CODE local:13 } -interrogateSS OPERATION ::= { --Timer m +interrogateSS OPERATION ::= { --Timer m ARGUMENT SS-ForBS-Code RESULT @@ -181,7 +181,7 @@ interrogateSS OPERATION ::= { --Timer m ss-NotAvailable} CODE local:14 } -processUnstructuredSS-Request OPERATION ::= { --Timer 10 minutes +processUnstructuredSS-Request OPERATION ::= { --Timer 10 minutes ARGUMENT USSD-Arg RESULT @@ -194,7 +194,7 @@ processUnstructuredSS-Request OPERATION ::= { --Timer 10 minutes callBarred} CODE local:59 } -unstructuredSS-Request OPERATION ::= { --Timer ml +unstructuredSS-Request OPERATION ::= { --Timer ml ARGUMENT USSD-Arg RESULT @@ -211,7 +211,7 @@ unstructuredSS-Request OPERATION ::= { --Timer ml ussd-Busy} CODE local:60 } -unstructuredSS-Notify OPERATION ::= { --Timer ml +unstructuredSS-Notify OPERATION ::= { --Timer ml ARGUMENT USSD-Arg RETURN RESULT TRUE @@ -226,7 +226,7 @@ unstructuredSS-Notify OPERATION ::= { --Timer ml ussd-Busy} CODE local:61 } -registerPassword OPERATION ::= { --Timer ml +registerPassword OPERATION ::= { --Timer ml ARGUMENT SS-Code RESULT @@ -244,14 +244,14 @@ registerPassword OPERATION ::= { --Timer ml getPassword} CODE local:17 } -getPassword OPERATION ::= { --Timer m +getPassword OPERATION ::= { --Timer m ARGUMENT GuidanceInfo RESULT Password CODE local:18 } -ss-InvocationNotification OPERATION ::= { --Timer m +ss-InvocationNotification OPERATION ::= { --Timer m ARGUMENT SS-InvocationNotificationArg RESULT @@ -263,7 +263,7 @@ ss-InvocationNotification OPERATION ::= { --Timer m unknownSubscriber} CODE local:72 } -registerCC-Entry OPERATION ::= { --Timer m +registerCC-Entry OPERATION ::= { --Timer m ARGUMENT RegisterCC-EntryArg RESULT @@ -281,7 +281,7 @@ registerCC-Entry OPERATION ::= { --Timer m facilityNotSupported} CODE local:76 } -eraseCC-Entry OPERATION ::= { --Timer m +eraseCC-Entry OPERATION ::= { --Timer m ARGUMENT EraseCC-EntryArg RESULT diff --git a/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn index 728209d92d..082663910f 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V15.5.0 (2019-06) +-- 3GPP TS 29.002 V17.1.0 (2021-06) -- 17.7.9 Teleservice Codes MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version18 (18)} + gsm-Network (1) modules (3) map-TS-Code (19) version20 (20)} DEFINITIONS @@ -40,7 +40,7 @@ Ext-TeleserviceCode ::= OCTET STRING (SIZE (1..5)) allTeleservices TeleserviceCode ::= '00000000'B allSpeechTransmissionServices TeleserviceCode ::= '00010000'B -telephony TeleserviceCode ::= '00010001'B +telephony TeleserviceCode ::= '00010001'B emergencyCalls TeleserviceCode ::= '00010010'B allShortMessageServices TeleserviceCode ::= '00100000'B |