diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-12 16:41:42 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-12 16:41:42 +0000 |
| commit | 616ef81058f1808000154ad236f586c23bd4c6a8 (patch) | |
| tree | 92f00ce4488fa09c2582e3c7acf70e8f4eae7c98 | |
| parent | 620a47ac72d1b0b40df3be63c6acf92e297378bd (diff) | |
Update the Camel and MAP ASN.1 files.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39386 f5534014-38df-0310-8fa8-9805f1628bb7
41 files changed, 1843 insertions, 330 deletions
diff --git a/asn1/camel/CAP-GPRS-ReferenceNumber.asn b/asn1/camel/CAP-GPRS-ReferenceNumber.asn index 7b243b3dfb..8168816cd7 100644 --- a/asn1/camel/CAP-GPRS-ReferenceNumber.asn +++ b/asn1/camel/CAP-GPRS-ReferenceNumber.asn @@ -1,6 +1,7 @@ -- $Id$ --- 3GPP TS 29.078 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 29.078 11.0.0 (2011-09) -- 8.1.1 GPRS Reference Number + CAP-GPRS-ReferenceNumber {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-dialogueInformation(111) version8(7)} -- Module CAP-GPRS-ReferenceNumber is updated to version8(7) for Rel-6. The definitions diff --git a/asn1/camel/CAP-SMS-ops-args.asn b/asn1/camel/CAP-SMS-ops-args.asn index aaa9dce8ef..2eb89a830a 100644 --- a/asn1/camel/CAP-SMS-ops-args.asn +++ b/asn1/camel/CAP-SMS-ops-args.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 7 SMS Control -- 7.1 SMS operations and arguments CAP-SMS-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-SMS-ops-args(105) version8(7)} @@ -9,7 +9,7 @@ CAP-SMS-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) um DEFINITIONS IMPLICIT TAGS::= BEGIN -- This module contains the operations and operation arguments used for the --- smsSSF– gsmSCF interface, for the control of MO-SMS and MT-SMS. +-- smsSSF? gsmSCF interface, for the control of MO-SMS and MT-SMS. -- The table in subclause 2.1 lists the specifications that contain the modules -- that are used by CAP. diff --git a/asn1/camel/CAP-U-ABORT-Data.asn b/asn1/camel/CAP-U-ABORT-Data.asn index 8e401ea9e6..4a706720f9 100644 --- a/asn1/camel/CAP-U-ABORT-Data.asn +++ b/asn1/camel/CAP-U-ABORT-Data.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.7 User Abort Data CAP-U-ABORT-Data {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-u-abort-data(110) version8(7)} diff --git a/asn1/camel/CAP-classes.asn b/asn1/camel/CAP-classes.asn index b24aef04a7..4b9ab91daf 100644 --- a/asn1/camel/CAP-classes.asn +++ b/asn1/camel/CAP-classes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.5 Classes CAP-classes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-classes(54) version8(7)} diff --git a/asn1/camel/CAP-datatypes.asn b/asn1/camel/CAP-datatypes.asn index 66fbc28c69..3ef9f78d13 100644 --- a/asn1/camel/CAP-datatypes.asn +++ b/asn1/camel/CAP-datatypes.asn @@ -1,7 +1,8 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5 Common CAP Types -- 5.1 Data types + CAP-datatypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-datatypes(52) version8(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -29,6 +30,7 @@ cs2(20) modules(0) in-cs2-datatypes(0) version1(0)} ISDN-AddressString, LAIFixedLength, GSN-Address, -- WS moved to common datatypes in rel 9.0.0 + RAIdentity, -- WS moved to common datatypes in rel 10.4.0 NAEA-CIC FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} @@ -37,11 +39,11 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} Ext2-QoS-Subscribed, Ext3-QoS-Subscribed, GeographicalInformation, --- GSN-Address, WS moved to common datatypes in rel 9.0.0 +-- GSN-Address, WS moved to common datatypes in rel 9.0.0 LocationInformation, LSAIdentity, QoS-Subscribed, - RAIdentity, +-- RAIdentity, WS moved to common datatypes in rel 10.4.0 SubscriberState, GPRSChargingID FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) @@ -601,8 +603,8 @@ DpSpecificInfoAlt {PARAMETERS-BOUND : bound} ::= SEQUENCE { collectedInfoSpecificInfo [2] SEQUENCE { calledPartyNumber [0] CalledPartyNumber OPTIONAL, ... - } - } + } + } -- This datatype is for extension in future releases. ElapsedTime ::= CHOICE { diff --git a/asn1/camel/CAP-errorcodes.asn b/asn1/camel/CAP-errorcodes.asn index 448baa9780..63cf594f52 100644 --- a/asn1/camel/CAP-errorcodes.asn +++ b/asn1/camel/CAP-errorcodes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.4 Error codes CAP-errorcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errorcodes(57) version8(7)} diff --git a/asn1/camel/CAP-errortypes.asn b/asn1/camel/CAP-errortypes.asn index 3fe76cc4bb..e48ff64d83 100644 --- a/asn1/camel/CAP-errortypes.asn +++ b/asn1/camel/CAP-errortypes.asn @@ -1,6 +1,7 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.2 Error types + CAP-errortypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-errortypes(51) version8(7)} -- This module contains the type definitions for the CAP Error Types. diff --git a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn index 07a5b49b20..46db201ce1 100644 --- a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn +++ b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn @@ -1,7 +1,8 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 8 GPRS Control -- 8.1 gsmSCF/gprsSSF operations and arguments + CAP-gprsSSF-gsmSCF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-GPRS-ops-args(107) version8(7)} -- Module CAP-gprsSSF-gsmSCF-ops-args is updated to version8(7) for Rel-6. The OPERATION @@ -10,7 +11,7 @@ umts-network(1) modules(3) cap-GPRS-ops-args(107) version8(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN -- This module contains the operations and operation arguments used for the --- gprsSSF – gsmSCF interface, for the control of GPRS. +-- gprsSSF ? gsmSCF interface, for the control of GPRS. -- The table in subclause 2.1 lists the specifications that contain the modules -- that are used by CAP. @@ -39,14 +40,15 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)} IMEI, IMSI, GSN-Address, -- WS moved to common datatypes in rel 9.0.0 + RAIdentity, -- WS moved to common datatypes in rel 10.4.0 ISDN-AddressString FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) modules(3) map-CommonDataTypes(18) version12(12)} GPRSChargingID, - GPRSMSClass, + GPRSMSClass -- GSN-Address, WS moved to common datatypes in rel 9.0.0 - RAIdentity +-- RAIdentity WS moved to common datatypes in rel 10.4.0 FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) modules(3) map-MS-DataTypes(11) version12(12)} @@ -375,7 +377,7 @@ resetTimerGPRS OPERATION ::= { unexpectedParameter | unknownPDPID} CODE opcode-resetTimerGPRS} --- Direction: gsmSCF –? gprsSSF, Timer: Trtg +-- Direction: gsmSCF ? gprsSSF, Timer: Trtg -- This operation is used to request the gprsSSF to refresh an application timer in the gprsSSF. ResetTimerGPRSArg ::= SEQUENCE { diff --git a/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn b/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn index 7ef65e971d..f524ac0aaa 100644 --- a/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn +++ b/asn1/camel/CAP-gsmSCF-gsmSRF-ops-args.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 6.2 gsmSCF/gsmSRF interface -- 6.2.1 gsmSCF/gsmSRF operations and arguments CAP-gsmSCF-gsmSRF-ops-args {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) diff --git a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn index 1cfc346c3c..7728ae1e3f 100644 --- a/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn +++ b/asn1/camel/CAP-gsmSSF-gsmSCF-ops-args.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 6 Circuit Switched Call Control -- 6.1 gsmSSF/CCF - gsmSCF Interface -- 6.1.1 Operations and arguments @@ -363,7 +363,7 @@ collectInformation {PARAMETERS-BOUND : bound} OPERATION::= { CollectInformationArg {PARAMETERS-BOUND : bound} ::= SEQUENCE{ extensions [0] Extensions {bound} OPTIONAL, ... - } +} connect {PARAMETERS-BOUND : bound} OPERATION ::= { ARGUMENT ConnectArg {bound} @@ -686,7 +686,8 @@ InitialDPArgExtension {PARAMETERS-BOUND : bound} ::= SEQUENCE { ..., enhancedDialledServicesAllowed [11] NULL OPTIONAL, uu-Data [12] UU-Data OPTIONAL, - collectInformationAllowed [13] NULL OPTIONAL + collectInformationAllowed [13] NULL OPTIONAL, + releaseCallArgExtensionAllowed [14] NULL OPTIONAL } -- If iPSSPCapabilities is not present then this denotes that a colocated gsmSRF is not -- supported by the gsmSSF. If present, then the gsmSSF supports a colocated gsmSRF capable @@ -729,7 +730,8 @@ InitiateCallAttemptRes {PARAMETERS-BOUND : bound} ::= SEQUENCE { supportedCamelPhases [0] SupportedCamelPhases OPTIONAL, offeredCamel4Functionalities [1] OfferedCamel4Functionalities OPTIONAL, extensions [2] Extensions {bound} OPTIONAL, - ... + ..., + releaseCallArgExtensionAllowed [3] NULL OPTIONAL } moveLeg {PARAMETERS-BOUND : bound} OPERATION ::= { @@ -785,9 +787,19 @@ releaseCall {PARAMETERS-BOUND : bound} OPERATION ::= { -- This operation is used to tear down an existing call at any phase of the call for all parties -- involved in the call. -ReleaseCallArg {PARAMETERS-BOUND : bound} ::= Cause {bound} +ReleaseCallArg {PARAMETERS-BOUND : bound} ::= CHOICE { + allCallSegments AllCallSegments, + allCallSegmentsWithExtension [2] AllCallSegmentsWithExtension + } + +AllCallSegments ::= Cause {bound} -- A default value of decimal 31 (normal unspecified) shall be given. +AllCallSegmentsWithExtension ::= SEQUENCE { + allCallSegments [0] AllCallSegments, + extensions [1] Extensions {bound} OPTIONAL + } + requestReportBCSMEvent {PARAMETERS-BOUND : bound} OPERATION ::= { ARGUMENT RequestReportBCSMEventArg {bound} RETURN RESULT FALSE diff --git a/asn1/camel/CAP-object-identifiers.asn b/asn1/camel/CAP-object-identifiers.asn index d9e54e1f53..5d799fbe5c 100644 --- a/asn1/camel/CAP-object-identifiers.asn +++ b/asn1/camel/CAP-object-identifiers.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.6 Object IDentifiers (IDs) CAP-object-identifiers {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-object-identifiers(100) version8(7)} diff --git a/asn1/camel/CAP-operationcodes.asn b/asn1/camel/CAP-operationcodes.asn index 12dc3859de..f6ebd1270a 100644 --- a/asn1/camel/CAP-operationcodes.asn +++ b/asn1/camel/CAP-operationcodes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.078 9.2.0 (2010-06) +-- 3GPP TS 29.078 11.0.0 (2011-09) -- 5.3 Operation codes CAP-operationcodes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3) cap-operationcodes(53) version8(7)} @@ -118,4 +118,3 @@ FROM Remote-Operations-Information-Objects ros-InformationObjects opcode-sendChargingInformationGPRS Code ::= local: 83 END - diff --git a/asn1/gsm_map/GSMMAP.asn b/asn1/gsm_map/GSMMAP.asn index 47e7399a2a..8fe32799e8 100644 --- a/asn1/gsm_map/GSMMAP.asn +++ b/asn1/gsm_map/GSMMAP.asn @@ -219,7 +219,6 @@ GSMMAPOperationLocalvalue ::= INTEGER{ unAllocated (106), unAllocated (107), unAllocated (108), - unAllocated (109), lcs-PeriodicLocationCancellation (109), lcs-LocationUpdate (110), lcs-PeriodicLocationRequest (111), diff --git a/asn1/gsm_map/MAP-ApplicationContexts.asn b/asn1/gsm_map/MAP-ApplicationContexts.asn index b5ffe2ce01..f91f3403c3 100644 --- a/asn1/gsm_map/MAP-ApplicationContexts.asn +++ b/asn1/gsm_map/MAP-ApplicationContexts.asn @@ -1,10 +1,10 @@ -- $Id$ --17.3.3 ASN.1 Module for application-context-names --The following ASN.1 module summarises the application-context-name assigned to MAP application-contexts. --- 3GPP TS 29.002 V9.1.0 (2010-03) +-- 3GPP TS 29.002 V10.4.0 (2011-09) MAP-ApplicationContexts { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ApplicationContexts (2) version11 (11)} + gsm-Network (1) modules (3) map-ApplicationContexts (2) version13 (13)} DEFINITIONS diff --git a/asn1/gsm_map/MAP-BS-Code.asn b/asn1/gsm_map/MAP-BS-Code.asn index eba06b41fa..3a68600988 100644 --- a/asn1/gsm_map/MAP-BS-Code.asn +++ b/asn1/gsm_map/MAP-BS-Code.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-BS-Code (20) version13 (13)} DEFINITIONS diff --git a/asn1/gsm_map/MAP-CH-DataTypes.asn b/asn1/gsm_map/MAP-CH-DataTypes.asn index 224b9579b9..d141156c74 100644 --- a/asn1/gsm_map/MAP-CH-DataTypes.asn +++ b/asn1/gsm_map/MAP-CH-DataTypes.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-CH-DataTypes (13) version13 (13)} DEFINITIONS @@ -36,10 +36,10 @@ EXPORTS IST-CommandRes, UU-Data, ReleaseResourcesArg, -ReleaseResourcesRes, -- WS added exports needed by gsm_map.asn (extra asn1 file to handle older proto. ver.) RoutingInfo, -CUG-CheckInfo +CUG-CheckInfo, +ReleaseResourcesRes ; IMPORTS @@ -58,14 +58,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) version12 (12)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version13 (13)} 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) version12 (12)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version13 (13)} ISDN-AddressString, ISDN-SubaddressString, @@ -80,12 +80,12 @@ FROM MAP-SS-DataTypes { EMLPP-Priority FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; @@ -258,14 +258,17 @@ ProvideRoamingNumberArg ::= SEQUENCE { offeredCamel4CSIsInInterrogatingNode [20] OfferedCamel4CSIs OPTIONAL, mtRoamingRetrySupported [21] NULL OPTIONAL, pagingArea [22] PagingArea OPTIONAL, - callPriority [23] EMLPP-Priority OPTIONAL + callPriority [23] EMLPP-Priority OPTIONAL, + mtrf-Indicator [24] NULL OPTIONAL, + oldMSC-Number [25] ISDN-AddressString OPTIONAL } 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, diff --git a/asn1/gsm_map/MAP-CallHandlingOperations.asn b/asn1/gsm_map/MAP-CallHandlingOperations.asn index c17267e658..ee23e890e1 100644 --- a/asn1/gsm_map/MAP-CallHandlingOperations.asn +++ b/asn1/gsm_map/MAP-CallHandlingOperations.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) --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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -53,7 +53,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) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} SendRoutingInfoArg, SendRoutingInfoRes, ProvideRoamingNumberArg, @@ -74,7 +74,7 @@ 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) version12 (12)} + gsm-Network (1) modules (3) map-CH-DataTypes (13) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-CommonDataTypes.asn b/asn1/gsm_map/MAP-CommonDataTypes.asn index 7031f233a8..53702fc046 100644 --- a/asn1/gsm_map/MAP-CommonDataTypes.asn +++ b/asn1/gsm_map/MAP-CommonDataTypes.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} DEFINITIONS @@ -30,6 +30,7 @@ AccessNetworkSignalInfo, AlertingPattern, TBCD-STRING, DiameterIdentity, + Time, -- data types for numbering and identification IMSI, @@ -47,6 +48,9 @@ AccessNetworkSignalInfo, ASCI-CallReference, SubscriberIdentity, PLMN-Id, + E-UTRAN-CGI, + TA-Id, + RAIdentity, -- data types for CAMEL CellGlobalIdOrServiceAreaIdOrLAI, @@ -68,9 +72,9 @@ AccessNetworkSignalInfo, LCSClientExternalID, LCSClientInternalID, LCSServiceTypeID, - -- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.) ProtocolId, + -- gprs location registration types GSN-Address @@ -81,23 +85,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) version12 (12)} + gsm-Network (1) modules (3) map-TS-Code (19) version13 (13)} 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) version12 (12)} + gsm-Network (1) modules (3) map-BS-Code (20) version13 (13)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version12 (12)} + gsm-Network (1) modules (3) map-SS-Code (15) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; @@ -312,6 +316,10 @@ alertingCategory-5 AlertingPattern ::= '00001000'B GSN-Address ::= OCTET STRING (SIZE (5..17)) -- Octets are coded according to TS 3GPP TS 23.003 [17] +Time ::= OCTET STRING (SIZE (4)) + -- Octets are coded according to IETF RFC 3588 [139] + + -- data types for numbering and identification IMSI ::= TBCD-STRING (SIZE (3..8)) @@ -529,6 +537,17 @@ PLMN-Id ::= OCTET STRING (SIZE (3)) -- octet 3 bits 4321 Mobile Network Code 1st digit -- bits 8765 Mobile Network Code 2nd digit +E-UTRAN-CGI ::= OCTET STRING (SIZE (7)) + -- Octets are coded as described in 3GPP TS 29.118. + +TA-Id ::= OCTET STRING (SIZE (5)) + -- Octets are coded as described in 3GPP TS 29.118. + +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 +-- type identifier octet shall not be included. + -- data types for CAMEL CellGlobalIdOrServiceAreaIdOrLAI ::= CHOICE { diff --git a/asn1/gsm_map/MAP-DialogueInformation.asn b/asn1/gsm_map/MAP-DialogueInformation.asn index 250674b812..9aae3a5596 100644 --- a/asn1/gsm_map/MAP-DialogueInformation.asn +++ b/asn1/gsm_map/MAP-DialogueInformation.asn @@ -1,9 +1,9 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 17.4 MAP Dialogue Information MAP-DialogueInformation { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-DialogueInformation (3) version12 (12)} + gsm-Network (1) modules (3) map-DialogueInformation (3) version13 (13)} 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) version12 (12)} + gsm-Network(1) modules (3) map-CommonDataTypes (18) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-ER-DataTypes.asn b/asn1/gsm_map/MAP-ER-DataTypes.asn index cfda185dfc..8aee04256a 100644 --- a/asn1/gsm_map/MAP-ER-DataTypes.asn +++ b/asn1/gsm_map/MAP-ER-DataTypes.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version13 (13)} DEFINITIONS @@ -70,7 +70,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) version12 (12)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version13 (13)} SignalInfo, BasicServiceCode, @@ -78,18 +78,18 @@ FROM MAP-SS-DataTypes { AdditionalNetworkResource FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version12 (12)} + gsm-Network (1) modules (3) map-SS-Code (15) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; RoamingNotAllowedParam ::= SEQUENCE { @@ -271,7 +271,8 @@ AbsentSubscriberReason ::= ENUMERATED { noPageResponse (2), ... , purgedMS (3), - mtRoamingRetry (4)} + mtRoamingRetry (4), + busySubscriber (5)} -- exception handling: at reception of other values than the ones listed the -- AbsentSubscriberReason shall be ignored. -- The AbsentSubscriberReason: purgedMS is defined for the Super-Charger feature @@ -280,6 +281,8 @@ AbsentSubscriberReason ::= ENUMERATED { -- Information response -- The AbsentSubscriberReason: mtRoamingRetry is used during MT Roaming Retry, -- see 3GPP TS 23.018[97]. +-- The AbsentSubscriberReason: busySubscriber is used during MT Roaming Forwarding, +-- see 3GPP TS 23.018[97]. BusySubscriberParam ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, diff --git a/asn1/gsm_map/MAP-Errors.asn b/asn1/gsm_map/MAP-Errors.asn index f5c86dc8a2..54aa6eea10 100644 --- a/asn1/gsm_map/MAP-Errors.asn +++ b/asn1/gsm_map/MAP-Errors.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 17.6.6 Errors MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} DEFINITIONS @@ -107,7 +107,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) version12 (12)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version13 (13)} SS-IncompatibilityCause, PW-RegistrationFailureCause, @@ -158,7 +158,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) version12 (12)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version13 (13)} ; -- generic errors diff --git a/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/asn1/gsm_map/MAP-ExtensionDataTypes.asn index ebd45f6002..7d8f94c78e 100644 --- a/asn1/gsm_map/MAP-ExtensionDataTypes.asn +++ b/asn1/gsm_map/MAP-ExtensionDataTypes.asn @@ -1,14 +1,14 @@ -- $Id$ -- MAP-ExtensionDataTypes.asn -- --- Taken from 3GPP TS 29.002 V9.3.0 (2010-09) +-- Taken from 3GPP TS 29.002 V10.4.0 (2011-09) -- -- 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) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} DEFINITIONS diff --git a/asn1/gsm_map/MAP-GR-DataTypes.asn b/asn1/gsm_map/MAP-GR-DataTypes.asn index fa87e40169..b04fdd84c8 100644 --- a/asn1/gsm_map/MAP-GR-DataTypes.asn +++ b/asn1/gsm_map/MAP-GR-DataTypes.asn @@ -1,12 +1,12 @@ -- $Id$ -- --- Taken from 3GPP TS 29.002 V9.3.0 (2010-09) +-- Taken from 3GPP TS 29.002 V10.4.0 (2011-09) -- --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) version12 (12)} + gsm-Network (1) modules (3) map-GR-DataTypes (23) version13 (13)} DEFINITIONS @@ -38,12 +38,12 @@ IMPORTS AccessNetworkSignalInfo FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version12 (12)} + gsm-Network (1) modules (3) map-TS-Code (19) version13 (13)} Kc, AdditionalInfo, @@ -53,12 +53,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) version12 (12)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-Group-Call-Operations.asn b/asn1/gsm_map/MAP-Group-Call-Operations.asn index 5eab73a159..26c1e35e35 100644 --- a/asn1/gsm_map/MAP-Group-Call-Operations.asn +++ b/asn1/gsm_map/MAP-Group-Call-Operations.asn @@ -1,11 +1,11 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -36,7 +36,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) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} PrepareGroupCallArg, PrepareGroupCallRes, @@ -48,7 +48,7 @@ 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) version12 (12)} + gsm-Network (1) modules (3) map-GR-DataTypes (23) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-LCS-DataTypes.asn b/asn1/gsm_map/MAP-LCS-DataTypes.asn index 74a4d7bbf1..661a225bce 100644 --- a/asn1/gsm_map/MAP-LCS-DataTypes.asn +++ b/asn1/gsm_map/MAP-LCS-DataTypes.asn @@ -1,14 +1,14 @@ -- $Id$ -- MAP-LCS-DataTypes.asn -- --- Taken from 3GPP TS 29.002 V9.3.0 (2010-09) +-- Taken from 3GPP TS 29.002 V10.4.0 (2011-09) -- -- 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) version12 (12)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version13 (13)} DEFINITIONS IMPLICIT TAGS @@ -58,30 +58,30 @@ PLMN-Id, DiameterIdentity FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} ExtensionContainer, SLR-ArgExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} 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) version12 (12)} + map-SS-DataTypes (14) version13 (13)} 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) version12 (12)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version13 (13)} Additional-Number FROM MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version12 (12)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-LocationServiceOperations.asn b/asn1/gsm_map/MAP-LocationServiceOperations.asn index 0135d34d54..dddf195c13 100644 --- a/asn1/gsm_map/MAP-LocationServiceOperations.asn +++ b/asn1/gsm_map/MAP-LocationServiceOperations.asn @@ -1,11 +1,11 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -41,7 +41,7 @@ systemFailure, illegalSubscriber FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} RoutingInfoForLCS-Arg, RoutingInfoForLCS-Res, @@ -51,7 +51,7 @@ 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) version12 (12)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version13 (13)} ; sendRoutingInfoForLCS OPERATION ::= { --Timer m diff --git a/asn1/gsm_map/MAP-MS-DataTypes.asn b/asn1/gsm_map/MAP-MS-DataTypes.asn index 1f5a763c37..4df7fa7ae1 100644 --- a/asn1/gsm_map/MAP-MS-DataTypes.asn +++ b/asn1/gsm_map/MAP-MS-DataTypes.asn @@ -4,7 +4,7 @@ MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version12 (12)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version13 (13)} DEFINITIONS @@ -112,7 +112,6 @@ GPRSMSClass, SubscriberInfo, LocationInformation, LocationInformationGPRS, - RAIdentity, SubscriberState, GPRSChargingID, MNPInfoRes, @@ -162,25 +161,27 @@ IMPORTS SS-SubscriptionOption, SS-List, SS-ForBS-Code, - Password + Password, + OverrideCategory, + CliRestrictionOption FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version12 (12)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version13 (13)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version12 (12)} + gsm-Network (1) modules (3) map-SS-Code (15) version13 (13)} Ext-BearerServiceCode FROM MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version12 (12)} + gsm-Network (1) modules (3) map-BS-Code (20) version13 (13)} Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version12 (12)} + gsm-Network (1) modules (3) map-TS-Code (19) version13 (13)} AddressString, ISDN-AddressString, @@ -211,25 +212,29 @@ ISDN-AddressString, PLMN-Id, EMLPP-Priority, GSN-Address, -DiameterIdentity +DiameterIdentity, +Time, +E-UTRAN-CGI, +TA-Id, +RAIdentity FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} AbsentSubscriberDiagnosticSM FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version12 (12)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version13 (13)} TracePropagationList FROM MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version12 (12)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version13 (13)} ; @@ -265,7 +270,8 @@ VLR-Capability ::= SEQUENCE{ supportedLCS-CapabilitySets [5] SupportedLCS-CapabilitySets OPTIONAL, offeredCamel4CSIs [6] OfferedCamel4CSIs OPTIONAL, supportedRAT-TypesIndicator [7] SupportedRAT-Types OPTIONAL, - longGroupID-Supported [8] NULL OPTIONAL } + longGroupID-Supported [8] NULL OPTIONAL, + mtRoamingForwardingSupported [9] NULL OPTIONAL } SupportedRAT-Types::= BIT STRING { utran (0), @@ -342,7 +348,15 @@ CancelLocationArg ::= [3] SEQUENCE { cancellationType CancellationType OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, ..., - typeOfUpdate [0] TypeOfUpdate OPTIONAL } + typeOfUpdate [0] TypeOfUpdate OPTIONAL, + mtrf-SupportedAndAuthorized [1] NULL OPTIONAL, + mtrf-SupportedAndNotAuthorized [2] NULL OPTIONAL, + newMSC-Number [3] ISDN-AddressString OPTIONAL, + newVLR-Number [4] ISDN-AddressString OPTIONAL, + new-lmsi [5] LMSI OPTIONAL + } + --mtrf-SupportedAndAuthorized and mtrf-SupportedAndNotAuthorized shall not + -- both be present TypeOfUpdate ::= ENUMERATED { sgsn-change (0), @@ -386,7 +400,10 @@ SendIdentificationArg ::= SEQUENCE { ..., msc-Number ISDN-AddressString OPTIONAL, previous-LAI [0] LAIFixedLength OPTIONAL, - hopCounter [1] HopCounter OPTIONAL } + hopCounter [1] HopCounter OPTIONAL, + mtRoamingForwardingSupported [2] NULL OPTIONAL, + newVLR-Number [3] ISDN-AddressString OPTIONAL, + new-lmsi [4] LMSI OPTIONAL } HopCounter ::= INTEGER (0..3) @@ -519,7 +536,8 @@ UpdateGprsLocationArg ::= SEQUENCE { nodeTypeIndicator [10] NULL OPTIONAL, areaRestricted [11] NULL OPTIONAL, ue-reachableIndicator [12] NULL OPTIONAL, - epsSubscriptionDataNotNeeded [13] NULL OPTIONAL } + epsSubscriptionDataNotNeeded [13] NULL OPTIONAL, + ue-srvcc-Capability [14] UE-SRVCC-Capability OPTIONAL } Used-RAT-Type::= ENUMERATED { utran (0), @@ -539,6 +557,12 @@ PDN-GW-Update ::= SEQUENCE{ contextId [2] ContextId OPTIONAL, extensionContainer [3] ExtensionContainer OPTIONAL, ... } +-- The pdn-gw-update IE shall include the pdn-gw-Identity, and the apn or/and the contextID. +-- The HSS shall ignore the eps-info IE if it includes a pdn-gw-update IE which does not +-- include pdn-gw-Identity. +-- The pdn-gw-Identity is defined as OPTIONAL for backward compatility reason with +-- outdated earlier versions of this specification. + ISR-Information::= BIT STRING { updateMME (0), @@ -591,6 +615,12 @@ SupportedFeatures::= BIT STRING { baoc (23), boic (24), boicExHC (25)} (SIZE (26..40)) + +UE-SRVCC-Capability::= ENUMERATED { + ue-srvcc-not-supported (0), + ue-srvcc-supported (1), + ...} + UpdateGprsLocationRes ::= SEQUENCE { hlr-Number ISDN-AddressString, extensionContainer ExtensionContainer OPTIONAL, @@ -692,7 +722,23 @@ PrepareHO-Arg ::= [3] SEQUENCE { imeisv [22] IMEI OPTIONAL, alternativeChannelType [23] RadioResourceInformation OPTIONAL, tracePropagationList [25] TracePropagationList OPTIONAL, - aoipSupportedCodecsListAnchor [26] AoIPCodecsList OPTIONAL } + aoipSupportedCodecsListAnchor [26] AoIPCodecsList OPTIONAL, + regionalSubscriptionData [27] ZoneCodeList OPTIONAL, + globalCallReference [28] LCLS-GlobalCallReference OPTIONAL, + lcls-Negotiation [29] LCLS-Negotiation OPTIONAL } + +LCLS-GlobalCallReference ::= OCTET STRING (SIZE (13..15)) + -- Octets are coded as specified in 3GPP TS 29.205 [146] + + +LCLS-Negotiation::= BIT STRING { + permission-indicator (0), + forward-data-sending-indicator (1), + backward-sending-indicator (2), + forward-data-reception-indicator (3), + backward-data-reception-indicator (4)} (SIZE (5..8)) + -- exception handling: bits 5 to 7 shall be ignored if received and not understood + BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF BSSMAP-ServiceHandoverInfo @@ -1039,10 +1085,20 @@ InsertSubscriberDataArg ::= SEQUENCE { csg-SubscriptionDataList [32] CSG-SubscriptionDataList OPTIONAL, ue-ReachabilityRequestIndicator [33] NULL OPTIONAL, sgsn-Number [34] ISDN-AddressString OPTIONAL, - mme-Name [35] DiameterIdentity OPTIONAL } + mme-Name [35] DiameterIdentity OPTIONAL, + subscribedPeriodicRAUTAUtimer [36] SubscribedPeriodicRAUTAUtimer OPTIONAL, + vplmnLIPAAllowed [37] NULL OPTIONAL, + mdtUserConsent [38] BOOLEAN OPTIONAL, + subscribedPeriodicLAUtimer [39] SubscribedPeriodicLAUtimer OPTIONAL } -- If the Network Access Mode parameter is sent, it shall be present only in -- the first sequence if seqmentation is used +SubscribedPeriodicRAUTAUtimer ::= INTEGER (0..4294967295) + -- This parameter carries the subscribed periodic TAU/RAU timer value in seconds. + +SubscribedPeriodicLAUtimer ::= INTEGER (0..4294967295) + -- This parameter carries the subscribed periodic LAU timer value in seconds. + CSG-SubscriptionDataList ::= SEQUENCE SIZE (1..50) OF CSG-SubscriptionData @@ -1050,13 +1106,17 @@ CSG-SubscriptionData ::= SEQUENCE { csg-Id CSG-Id, expirationDate Time OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, - ...} + ..., + lipa-AllowedAPNList [0] LIPA-AllowedAPNList OPTIONAL +} CSG-Id ::= BIT STRING (SIZE (27)) -- coded according to 3GPP TS 23.003 [17]. -Time ::= OCTET STRING (SIZE (4)) - -- Octets are coded according to IETF RFC 3588 [139] +LIPA-AllowedAPNList ::= SEQUENCE SIZE (1..maxNumOfLIPAAllowedAPN) OF + APN + +maxNumOfLIPAAllowedAPN INTEGER ::= 50 EPS-SubscriptionData ::= SEQUENCE { @@ -1067,7 +1127,13 @@ EPS-SubscriptionData ::= SEQUENCE { apn-ConfigurationProfile [4] APN-ConfigurationProfile OPTIONAL, stn-sr [6] ISDN-AddressString OPTIONAL, extensionContainer [5] ExtensionContainer OPTIONAL, - ... } + ..., + mps-CSPriority [7] NULL OPTIONAL, + mps-EPSPriority [8] NULL OPTIONAL } + -- mps-CSPriority by its presence indicates that the UE is subscribed to the eMLPP in + -- the CS domain, referring to the 3GPP TS 29.272 [144] for details. + -- mps-EPSPriority by its presence indicates that the UE is subscribed to the MPS in + -- the EPS domain, referring to the 3GPP TS 29.272 [144] for details. APN-OI-Replacement ::= OCTET STRING (SIZE (9..100)) -- Octets are coded as APN Operator Identifier according to TS 3GPP TS 23.003 [17] @@ -1104,8 +1170,10 @@ APN-Configuration ::= SEQUENCE { specificAPNInfoList [10] SpecificAPNInfoList OPTIONAL, extensionContainer [11] ExtensionContainer OPTIONAL, servedPartyIP-IPv6-Address [12] PDP-Address OPTIONAL, ..., - apn-oi-Replacement [13] APN-OI-Replacement OPTIONAL + apn-oi-Replacement [13] APN-OI-Replacement OPTIONAL, -- this apn-oi-Replacement refers to the APN level apn-oi-Replacement. + sipto-Permission [14] SIPTO-Permission OPTIONAL, + lipa-Permission [15] LIPA-Permission OPTIONAL } PDN-Type ::= OCTET STRING (SIZE (1)) @@ -1239,14 +1307,30 @@ PDP-Context ::= SEQUENCE { ext-pdp-Type [6] Ext-PDP-Type OPTIONAL, -- contains the value IPv4v6 defined in 3GPP TS 29.060 [105], if the PDP can be -- accessed by dual-stack UEs - ext-pdp-Address [7] PDP-Address OPTIONAL + ext-pdp-Address [7] PDP-Address OPTIONAL, -- contains an additional IP address in case of dual-stack static IP address assignment -- for the UE. -- 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, + -- this ambr contains the AMBR associated to the APN included in the + -- PDP-Context (APN-AMBR). + sipto-Permission [8] SIPTO-Permission OPTIONAL, + lipa-Permission [9] LIPA-Permission OPTIONAL } +SIPTO-Permission ::= ENUMERATED { + siptoAllowed (0), + siptoNotAllowed (1) + } + +LIPA-Permission ::= ENUMERATED { + lipaProhibited (0), + lipaOnly (1), + lipaConditional (2) + } + ContextId ::= INTEGER (1..maxNumOfPDP-Contexts) GPRSSubscriptionData ::= SEQUENCE { @@ -2416,16 +2500,19 @@ SubscriberInfo ::= SEQUENCE { eps-SubscriberState [12] PS-SubscriberState OPTIONAL, locationInformationEPS [13] LocationInformationEPS OPTIONAL } --- If the HLR receives locationInformation, subscriberState or ms-Classmark2 from an SGSN --- it shall discard them. --- If the HLR receives locationInformationGPRS, ps-SubscriberState or gprs-MS-Class from --- a VLR it shall discard them. +-- If the HLR receives locationInformation, subscriberState or ms-Classmark2 from an SGSN or +-- MME (via an IWF), it shall discard them. +-- If the HLR receives locationInformationGPRS, ps-SubscriberState, gprs-MS-Class or +-- 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. IMS-VoiceOverPS-SessionsInd ::= ENUMERATED { imsVoiceOverPS-SessionsNotSupported (0), - imsVoiceOverPS-SessionsSupported (1) + imsVoiceOverPS-SessionsSupported (1), + unknown (2) } +-- "unknown" shall not be used within ProvideSubscriberInfoRes MNPInfoRes ::= SEQUENCE { routeingNumber [0] RouteingNumber OPTIONAL, @@ -2483,11 +2570,16 @@ RequestedInfo ::= SEQUENCE { ms-classmark [5] NULL OPTIONAL, mnpRequestedInfo [7] NULL OPTIONAL, t-adsData [8] NULL OPTIONAL, - requestedNodes [9] RequestedNodes OPTIONAL } + requestedNodes [9] RequestedNodes OPTIONAL, + servingNodeIndication [10] NULL OPTIONAL } -- currentLocation shall be absent if locationInformation is absent -- t-adsData shall be absent in messages sent to the VLR -- requestedNodes shall be absent if requestedDomain is "cs-Domain" +-- servingNodeIndication shall be absent if locationInformation is absent; +-- servingNodeIndication shall be absent if current location is present; +-- servingNodeIndication indicates by its presence that only the serving node's +-- address (MME-Name or SGSN-Number or VLR-Number) is requested. DomainType ::= ENUMERATED { cs-Domain (0), @@ -2520,23 +2612,24 @@ LocationInformation ::= SEQUENCE { -- a Service Area Identity. -- currentLocationRetrieved shall be present -- if the location information were retrieved after a successfull paging. --- if the locationinformationEPS IE is present then the cellGlobalIdOrServiceAreaIdOrLAI IE --- shall be absent. +-- if the locationinformationEPS IE is present then the cellGlobalIdOrServiceAreaIdOrLAI IE, +-- the ageOfLocationInformation IE, the geographicalInformation IE, the geodeticInformation IE +-- and the currentLocationRetrieved IE (outside the locationInformationEPS IE) shall be +-- absent. -- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in -- the case the Access mode is Hybrid Mode. LocationInformationEPS ::= SEQUENCE { - e-utranCellGlobalIdentity [0] OCTET STRING (SIZE(7)) OPTIONAL, --- Octets are coded as described in 3GPP TS 29.118. - trackingAreaIdentity [1] OCTET STRING (SIZE(5)) OPTIONAL, --- Octets are coded as described in 3GPP TS 29.118. + e-utranCellGlobalIdentity [0] E-UTRAN-CGI OPTIONAL, + trackingAreaIdentity [1] TA-Id OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, geographicalInformation [3] GeographicalInformation OPTIONAL, geodeticInformation [4] GeodeticInformation OPTIONAL, currentLocationRetrieved [5] NULL OPTIONAL, ageOfLocationInformation [6] AgeOfLocationInformation OPTIONAL, - ...} + ..., + mme-Name [7] DiameterIdentity OPTIONAL } -- currentLocationRetrieved shall be present if the location information -- was retrieved after successful paging. @@ -2570,12 +2663,6 @@ UserCSGInformation ::= SEQUENCE { cmi [3] OCTET STRING (SIZE(1)) OPTIONAL } -- The encoding of the accessMode and cmi parameters are as defined in 3GPP TS 29.060 [105]. -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 --- type identifier octet shall not be included. - - GeographicalInformation ::= OCTET STRING (SIZE (8)) -- Refers to geographical Information defined in 3GPP TS 23.032. -- Only the description of an ellipsoid point with uncertainty circle @@ -2729,7 +2816,47 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE { offeredCamel4CSIsInVLR [8] OfferedCamel4CSIs OPTIONAL, offeredCamel4CSIsInSGSN [9] OfferedCamel4CSIs OPTIONAL, msisdn-BS-List [10] MSISDN-BS-List OPTIONAL, - csg-SubscriptionDataList [11] CSG-SubscriptionDataList OPTIONAL } + csg-SubscriptionDataList [11] CSG-SubscriptionDataList OPTIONAL, + cw-Data [12] CallWaitingData OPTIONAL, + ch-Data [13] CallHoldData OPTIONAL, + clip-Data [14] ClipData OPTIONAL, + clir-Data [15] ClirData OPTIONAL, + ect-data [16] EctData OPTIONAL } + +CallWaitingData ::= SEQUENCE { + cwFeatureList [1] Ext-CwFeatureList, + notificationToCSE [2] NULL OPTIONAL, + ... } + +Ext-CwFeatureList ::= SEQUENCE SIZE (1..maxNumOfExt-BasicServiceGroups) OF + Ext-CwFeature + +Ext-CwFeature ::= SEQUENCE { + basicService [1] Ext-BasicServiceCode, + ss-Status [2] Ext-SS-Status, + ... } + +ClipData ::= SEQUENCE { + ss-Status [1] Ext-SS-Status, + overrideCategory [2] OverrideCategory, + notificationToCSE [3] NULL OPTIONAL, + ... } + +ClirData ::= SEQUENCE { + ss-Status [1] Ext-SS-Status, + cliRestrictionOption [2] CliRestrictionOption OPTIONAL, + notificationToCSE [3] NULL OPTIONAL, + ... } + +CallHoldData ::= SEQUENCE { + ss-Status [1] Ext-SS-Status, + notificationToCSE [2] NULL OPTIONAL, + ... } + +EctData ::= SEQUENCE { + ss-Status [1] Ext-SS-Status, + notificationToCSE [2] NULL OPTIONAL, + ... } RequestedSubscriptionInfo ::= SEQUENCE { requestedSS-Info [1] SS-ForBS-Code OPTIONAL, @@ -2743,7 +2870,12 @@ RequestedSubscriptionInfo ::= SEQUENCE { [7] AdditionalRequestedCAMEL-SubscriptionInfo OPTIONAL, msisdn-BS-List [8] NULL OPTIONAL, - csg-SubscriptionDataRequested [9] NULL OPTIONAL } + csg-SubscriptionDataRequested [9] NULL OPTIONAL, + cw-Info [10] NULL OPTIONAL, + clip-Info [11] NULL OPTIONAL, + clir-Info [12] NULL OPTIONAL, + hold-Info [13] NULL OPTIONAL, + ect-Info [14] NULL OPTIONAL } MSISDN-BS-List ::= SEQUENCE SIZE (1..maxNumOfMSISDN) OF MSISDN-BS @@ -2837,16 +2969,59 @@ AnyTimeModificationArg ::= SEQUENCE { ..., modificationRequestFor-ODB-data [7] ModificationRequestFor-ODB-data OPTIONAL, modificationRequestFor-IP-SM-GW-Data [8] ModificationRequestFor-IP-SM-GW-Data OPTIONAL, - activationRequestForUE-reachability [9] ServingNode OPTIONAL, - modificationRequestFor-CSG [10] ModificationRequestFor-CSG OPTIONAL } + activationRequestForUE-reachability [9] RequestedServingNode OPTIONAL, + modificationRequestFor-CSG [10] ModificationRequestFor-CSG OPTIONAL, + modificationRequestFor-CW-Data [11] ModificationRequestFor-CW-Info OPTIONAL, + modificationRequestFor-CLIP-Data [12] ModificationRequestFor-CLIP-Info OPTIONAL, + modificationRequestFor-CLIR-Data [13] ModificationRequestFor-CLIR-Info OPTIONAL, + modificationRequestFor-HOLD-Data [14] ModificationRequestFor-CH-Info OPTIONAL, + modificationRequestFor-ECT-Data [15] ModificationRequestFor-ECT-Info OPTIONAL } + +ModificationRequestFor-CW-Info ::= SEQUENCE { + basicService [0] Ext-BasicServiceCode OPTIONAL, + ss-Status [1] Ext-SS-Status OPTIONAL, + modifyNotificationToCSE [2] ModificationInstruction OPTIONAL, + extensionContainer [3] ExtensionContainer OPTIONAL, + ...} + +ModificationRequestFor-CH-Info ::= SEQUENCE { + ss-Status [0] Ext-SS-Status OPTIONAL, + modifyNotificationToCSE [1] ModificationInstruction OPTIONAL, + extensionContainer [2] ExtensionContainer OPTIONAL, + ...} + +ModificationRequestFor-ECT-Info ::= SEQUENCE { + ss-Status [0] Ext-SS-Status OPTIONAL, + modifyNotificationToCSE [1] ModificationInstruction OPTIONAL, + extensionContainer [2] ExtensionContainer OPTIONAL, + ...} + +ModificationRequestFor-CLIR-Info ::= SEQUENCE { + ss-Status [0] Ext-SS-Status OPTIONAL, + cliRestrictionOption [1] CliRestrictionOption OPTIONAL, + modifyNotificationToCSE [2] ModificationInstruction OPTIONAL, + extensionContainer [3] ExtensionContainer OPTIONAL, + ...} + +ModificationRequestFor-CLIP-Info ::= SEQUENCE { + ss-Status [0] Ext-SS-Status OPTIONAL, + overrideCategory [1] OverrideCategory OPTIONAL, + modifyNotificationToCSE [2] ModificationInstruction OPTIONAL, + extensionContainer [3] ExtensionContainer OPTIONAL, + ...} + ModificationRequestFor-CSG ::= SEQUENCE { modifyNotificationToCSE [0] ModificationInstruction OPTIONAL, extensionContainer [1] ExtensionContainer OPTIONAL, ...} +RequestedServingNode ::= BIT STRING { + mmeAndSgsn (0)} (SIZE (1..8)) + ServingNode ::= BIT STRING { - mme (0)} (SIZE (1..8)) + mme (0), + sgsn (1)} (SIZE (2..8)) -- Other bits than listed above shall be discarded. AnyTimeModificationRes ::= SEQUENCE { @@ -2854,7 +3029,14 @@ AnyTimeModificationRes ::= SEQUENCE { camel-SubscriptionInfo [1] CAMEL-SubscriptionInfo OPTIONAL, extensionContainer [2] ExtensionContainer OPTIONAL, ..., - odb-Info [3] ODB-Info OPTIONAL } + odb-Info [3] ODB-Info OPTIONAL, + cw-Data [4] CallWaitingData OPTIONAL, + ch-Data [5] CallHoldData OPTIONAL, + clip-Data [6] ClipData OPTIONAL, + clir-Data [7] ClirData OPTIONAL, + ect-data [8] EctData OPTIONAL, + serviceCentreAddress [9] AddressString OPTIONAL + } ModificationRequestFor-CF-Info ::= SEQUENCE { ss-Code [0] SS-Code, @@ -2917,7 +3099,12 @@ NoteSubscriberDataModifiedArg ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, ..., ue-reachable [5] ServingNode OPTIONAL, - csg-SubscriptionDataList [6] CSG-SubscriptionDataList OPTIONAL } + csg-SubscriptionDataList [6] CSG-SubscriptionDataList OPTIONAL, + cw-Data [7] CallWaitingData OPTIONAL, + ch-Data [8] CallHoldData OPTIONAL, + clip-Data [9] ClipData OPTIONAL, + clir-Data [10] ClirData OPTIONAL, + ect-data [11] EctData OPTIONAL } NoteSubscriberDataModifiedRes ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, diff --git a/asn1/gsm_map/MAP-MobileServiceOperations.asn b/asn1/gsm_map/MAP-MobileServiceOperations.asn index 34fceb8ec7..19213aaedf 100644 --- a/asn1/gsm_map/MAP-MobileServiceOperations.asn +++ b/asn1/gsm_map/MAP-MobileServiceOperations.asn @@ -1,11 +1,11 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -110,7 +110,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) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} UpdateLocationArg, UpdateLocationRes, @@ -165,7 +165,7 @@ PrepareSubsequentHO-Res, FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version12 (12)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-OM-DataTypes.asn b/asn1/gsm_map/MAP-OM-DataTypes.asn index 0afb5d1476..27e6133db2 100644 --- a/asn1/gsm_map/MAP-OM-DataTypes.asn +++ b/asn1/gsm_map/MAP-OM-DataTypes.asn @@ -1,10 +1,10 @@ -- $Id$ -- 17.7.2 Operation and maintenance data types --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version12 (12)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version13 (13)} DEFINITIONS @@ -25,15 +25,20 @@ EXPORTS IMPORTS AddressString, IMSI, - GSN-Address + GSN-Address, + GlobalCellId, + E-UTRAN-CGI, + TA-Id, + RAIdentity, + LAIFixedLength FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; @@ -49,9 +54,124 @@ ActivateTraceModeArg ::= SEQUENCE { traceNE-TypeList [7] TraceNE-TypeList OPTIONAL, traceInterfaceList [8] TraceInterfaceList OPTIONAL, traceEventList [9] TraceEventList OPTIONAL, - traceCollectionEntity [10] GSN-Address OPTIONAL + traceCollectionEntity [10] GSN-Address OPTIONAL, + mdt-Configuration [11] MDT-Configuration OPTIONAL } +MDT-Configuration ::= SEQUENCE { + jobType JobType, + areaScope AreaScope OPTIONAL, + listOfMeasurements ListOfMeasurements OPTIONAL, + reportingTrigger [0] ReportingTrigger OPTIONAL, + reportInterval ReportInterval OPTIONAL, + reportAmount [1] ReportAmount OPTIONAL, + eventThresholdRSRP EventThresholdRSRP OPTIONAL, + eventThresholdRSRQ [2] EventThresholdRSRQ OPTIONAL, + loggingInterval [3] LoggingInterval OPTIONAL, + loggingDuration [4] LoggingDuration OPTIONAL, + extensionContainer [5] ExtensionContainer OPTIONAL, + ... } + +JobType ::= ENUMERATED { + immediate-MDT-only (0), + logged-MDT-only (1), + trace-only (2), + immediate-MDT-and-trace (3)} + +AreaScope ::= SEQUENCE { + cgi-List [0] CGI-List OPTIONAL, + e-utran-cgi-List [1] E-UTRAN-CGI-List OPTIONAL, + routingAreaId-List [2] RoutingAreaId-List OPTIONAL, + locationAreaId-List [3] LocationAreaId-List OPTIONAL, + trackingAreaId-List [4] TrackingAreaId-List OPTIONAL, + extensionContainer [5] ExtensionContainer OPTIONAL, + ... } + +CGI-List ::= SEQUENCE SIZE (1..32) OF + GlobalCellId + +E-UTRAN-CGI-List ::= SEQUENCE SIZE (1..32) OF + E-UTRAN-CGI + +RoutingAreaId-List ::= SEQUENCE SIZE (1..8) OF + RAIdentity + +LocationAreaId-List ::= SEQUENCE SIZE (1..8) OF + LAIFixedLength + +TrackingAreaId-List ::= SEQUENCE SIZE (1..8) OF + TA-Id +ListOfMeasurements ::= OCTET STRING (SIZE (4)) + -- Octets are coded as described in 3GPP TS 32.422. + +ReportingTrigger ::= OCTET STRING (SIZE (1)) + -- Octet is coded as described in 3GPP TS 32.422. + +ReportInterval ::= ENUMERATED { + umts250ms (0), + umts500ms (1), + umts1000ms (2), + umts2000ms (3), + umts3000ms (4), + umts4000ms (5), + umts6000ms (6), + umts8000ms (7), + umts12000ms (8), + umts16000ms (9), + umts20000ms (10), + umts24000ms (11), + umts28000ms (12), + umts32000ms (13), + umts64000ms (14), + lte120ms (15), + lte240ms (16), + lte480ms (17), + lte640ms (18), + lte1024ms (19), + lte2048ms (20), + lte5120ms (21), + lte10240ms (22), + lte1min (23), + lte6min (24), + lte12min (25), + lte30min (26), + lte60min (27)} + + +ReportAmount ::= ENUMERATED { + d1 (0), + d2 (1), + d4 (2), + d8 (3), + d16 (4), + d32 (5), + d64 (6), + infinity (7)} + +EventThresholdRSRP ::= INTEGER + (0..97) + +EventThresholdRSRQ ::= INTEGER + (0..34) + +LoggingInterval ::= ENUMERATED { + d1dot28 (0), + d2dot56 (1), + d5dot12 (2), + d10dot24 (3), + d20dot48 (4), + d30dot72 (5), + d40dot96 (6), + d61dot44 (7)} + +LoggingDuration ::= ENUMERATED { + d600sec (0), + d1200sec (1), + d2400sec (2), + d3600sec (3), + d5400sec (4), + d7200sec (5)} + TraceReference ::= OCTET STRING (SIZE (1..2)) TraceReference2 ::= OCTET STRING (SIZE (3)) diff --git a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn index 4fc8725d7f..1975254477 100644 --- a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn +++ b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) --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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -33,7 +33,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) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} ActivateTraceModeArg, ActivateTraceModeRes, @@ -41,13 +41,13 @@ 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) version12 (12)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version13 (13)} ISDN-AddressString, IMSI FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-Protocol.asn b/asn1/gsm_map/MAP-Protocol.asn index 8605907479..4e5ad2ed24 100644 --- a/asn1/gsm_map/MAP-Protocol.asn +++ b/asn1/gsm_map/MAP-Protocol.asn @@ -1,9 +1,9 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) --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) version12 (12)} + gsm-Network (1) modules (3) map-Protocol (4) version13 (13)} DEFINITIONS @@ -48,7 +48,7 @@ authenticationFailureReport, FROM MAP-MobileServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-MobileServiceOperations (5) - version12 (12)} + version13 (13)} activateTraceMode, deactivateTraceMode, @@ -56,7 +56,7 @@ FROM MAP-MobileServiceOperations { FROM MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-OperationAndMaintenanceOperations (6) - version12 (12)} + version13 (13)} sendRoutingInfo, provideRoamingNumber, @@ -70,7 +70,7 @@ FROM MAP-OperationAndMaintenanceOperations { FROM MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CallHandlingOperations (7) - version12 (12)} + version13 (13)} registerSS, eraseSS, @@ -88,7 +88,7 @@ FROM MAP-CallHandlingOperations { FROM MAP-SupplementaryServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-SupplementaryServiceOperations (8) - version12 (12)} + version13 (13)} sendRoutingInfoForSM, mo-ForwardSM, @@ -101,7 +101,7 @@ FROM MAP-SupplementaryServiceOperations { FROM MAP-ShortMessageServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-ShortMessageServiceOperations (9) - version12 (12)} + version13 (13)} prepareGroupCall, processGroupCallSignalling, @@ -111,7 +111,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) - version12 (12)} + version13 (13)} provideSubscriberLocation, sendRoutingInfoForLCS, @@ -119,7 +119,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) - version12 (12)} + version13 (13)} ; diff --git a/asn1/gsm_map/MAP-SM-DataTypes.asn b/asn1/gsm_map/MAP-SM-DataTypes.asn index b4c8860cc5..45752cb18b 100644 --- a/asn1/gsm_map/MAP-SM-DataTypes.asn +++ b/asn1/gsm_map/MAP-SM-DataTypes.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version13 (13)} DEFINITIONS @@ -40,21 +40,22 @@ IMPORTS SignalInfo, IMSI, LMSI, - ASCI-CallReference + ASCI-CallReference, + Time FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} AbsentSubscriberDiagnosticSM FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version12 (12)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} ; @@ -69,7 +70,8 @@ RoutingInfoForSM-Arg ::= SEQUENCE { -- receiving of two numbers from the HLR sm-RP-MTI [8] SM-RP-MTI OPTIONAL, sm-RP-SMEA [9] SM-RP-SMEA OPTIONAL, - sm-deliveryNotIntended [10] SM-DeliveryNotIntended OPTIONAL } + sm-deliveryNotIntended [10] SM-DeliveryNotIntended OPTIONAL, + ip-sm-gwGuidanceIndicator [11] NULL OPTIONAL } SM-DeliveryNotIntended ::= ENUMERATED { onlyIMSI-requested (0), @@ -92,10 +94,14 @@ SM-RP-SMEA ::= OCTET STRING (SIZE (1..12)) RoutingInfoForSM-Res ::= SEQUENCE { imsi IMSI, locationInfoWithLMSI [0] LocationInfoWithLMSI, --- WS extension to handle old versions - mwd-Set [2] BOOLEAN OPTIONAL, - -- mwd-Set must be absent in version greater 1 extensionContainer [4] ExtensionContainer OPTIONAL, + ..., + ip-sm-gwGuidance [5] IP-SM-GW-Guidance OPTIONAL } + +IP-SM-GW-Guidance ::= SEQUENCE { + minimumDeliveryTimeValue SM-DeliveryTimerValue, + recommendedDeliveryTimeValue SM-DeliveryTimerValue, + extensionContainer ExtensionContainer OPTIONAL, ...} LocationInfoWithLMSI ::= SEQUENCE { @@ -139,7 +145,10 @@ MT-ForwardSM-Arg ::= SEQUENCE { sm-RP-UI SignalInfo, moreMessagesToSend NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, - ...} + ..., + smDeliveryTimer SM-DeliveryTimerValue OPTIONAL, + smDeliveryStartTime Time OPTIONAL } + -- SM-DeliveryTimerValue contains the value used by the SMS-GMSC MT-ForwardSM-Res ::= SEQUENCE { sm-RP-UI SignalInfo OPTIONAL, @@ -157,6 +166,8 @@ SM-RP-OA ::= CHOICE { serviceCentreAddressOA [4] AddressString, noSM-RP-OA [5] NULL} +SM-DeliveryTimerValue ::= INTEGER (30..600) + ReportSM-DeliveryStatusArg ::= SEQUENCE { msisdn ISDN-AddressString, serviceCentreAddress AddressString, diff --git a/asn1/gsm_map/MAP-SS-Code.asn b/asn1/gsm_map/MAP-SS-Code.asn index 14a8882641..7c58e527e5 100644 --- a/asn1/gsm_map/MAP-SS-Code.asn +++ b/asn1/gsm_map/MAP-SS-Code.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-SS-Code (15) version13 (13)} DEFINITIONS diff --git a/asn1/gsm_map/MAP-SS-DataTypes.asn b/asn1/gsm_map/MAP-SS-DataTypes.asn index 7e94a8e944..5f17189c8a 100644 --- a/asn1/gsm_map/MAP-SS-DataTypes.asn +++ b/asn1/gsm_map/MAP-SS-DataTypes.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version13 (13)} DEFINITIONS @@ -58,17 +58,17 @@ IMPORTS ExternalSignalInfo FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version13 (13)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version13 (13)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version12 (12)} + gsm-Network (1) modules (3) map-SS-Code (15) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn index 46fdc50ec6..f80e44f386 100644 --- a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn +++ b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn @@ -1,11 +1,11 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -46,7 +46,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) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} RoutingInfoForSM-Arg, RoutingInfoForSM-Res, @@ -64,7 +64,7 @@ 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) version12 (12)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version13 (13)} ; @@ -98,6 +98,7 @@ mo-ForwardSM OPERATION ::= { --Timer ml CODE local:46 } mt-ForwardSM OPERATION ::= { --Timer ml + -- the timer value may be subject to negotiation between GMSC and IP-SM-GW ARGUMENT MT-ForwardSM-Arg RESULT diff --git a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn index b08cd440a1..e7fe3eae88 100644 --- a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn +++ b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn @@ -1,11 +1,11 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) --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) - version12 (12)} + version13 (13)} DEFINITIONS @@ -60,7 +60,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) version12 (12)} + gsm-Network (1) modules (3) map-Errors (10) version13 (13)} RegisterSS-Arg, SS-Info, @@ -78,12 +78,12 @@ 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) version12 (12)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version13 (13)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version12 (12)} + gsm-Network (1) modules (3) map-SS-Code (15) version13 (13)} ; diff --git a/asn1/gsm_map/MAP-TS-Code.asn b/asn1/gsm_map/MAP-TS-Code.asn index 45d099b4bb..1e0bf58409 100644 --- a/asn1/gsm_map/MAP-TS-Code.asn +++ b/asn1/gsm_map/MAP-TS-Code.asn @@ -1,10 +1,10 @@ -- $Id$ --- 3GPP TS 29.002 V9.3.0 (2010-09) +-- 3GPP TS 29.002 V10.4.0 (2011-09) -- 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) version12 (12)} + gsm-Network (1) modules (3) map-TS-Code (19) version13 (13)} DEFINITIONS diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index d85e2daf04..fc84d27cd6 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-camel.c */ -/* ../../tools/asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . -O ../../epan/dissectors CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-camel-template.c */ @@ -525,11 +525,14 @@ static int hf_camel_lowLayerCompatibility2 = -1; /* LowLayerCompatibility */ static int hf_camel_enhancedDialledServicesAllowed = -1; /* NULL */ static int hf_camel_uu_Data = -1; /* UU_Data */ static int hf_camel_collectInformationAllowed = -1; /* NULL */ +static int hf_camel_releaseCallArgExtensionAllowed = -1; /* NULL */ static int hf_camel_legToBeCreated = -1; /* LegID */ static int hf_camel_newCallSegment = -1; /* CallSegmentID */ static int hf_camel_gsmSCFAddress = -1; /* ISDN_AddressString */ static int hf_camel_suppress_T_CSI = -1; /* NULL */ static int hf_camel_legIDToMove = -1; /* LegID */ +static int hf_camel_allCallSegments = -1; /* AllCallSegments */ +static int hf_camel_allCallSegmentsWithExtension = -1; /* AllCallSegmentsWithExtension */ static int hf_camel_bcsmEvents = -1; /* SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent */ static int hf_camel_bcsmEvents_item = -1; /* BCSMEvent */ static int hf_camel_timerID = -1; /* TimerID */ @@ -771,6 +774,8 @@ static gint ett_camel_InitiateCallAttemptArg = -1; static gint ett_camel_InitiateCallAttemptRes = -1; static gint ett_camel_MoveLegArg = -1; static gint ett_camel_PlayToneArg = -1; +static gint ett_camel_ReleaseCallArg = -1; +static gint ett_camel_AllCallSegmentsWithExtension = -1; static gint ett_camel_RequestReportBCSMEventArg = -1; static gint ett_camel_SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent = -1; static gint ett_camel_ResetTimerArg = -1; @@ -4378,7 +4383,7 @@ dissect_camel_UserCSGInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static const ber_sequence_t LocationInformationGPRS_sequence[] = { { &hf_camel_cellGlobalIdOrServiceAreaIdOrLAI, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_T_cellGlobalIdOrServiceAreaIdOrLAI }, - { &hf_camel_routeingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RAIdentity }, + { &hf_camel_routeingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_RAIdentity }, { &hf_camel_geographicalInformation, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GeographicalInformation }, { &hf_camel_sgsn_Number , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_camel_selectedLSAIdentity, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LSAIdentity }, @@ -5507,6 +5512,7 @@ static const ber_sequence_t InitialDPArgExtension_sequence[] = { { &hf_camel_enhancedDialledServicesAllowed, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_NULL }, { &hf_camel_uu_Data , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ch_UU_Data }, { &hf_camel_collectInformationAllowed, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_NULL }, + { &hf_camel_releaseCallArgExtensionAllowed, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -5588,6 +5594,7 @@ static const ber_sequence_t InitiateCallAttemptRes_sequence[] = { { &hf_camel_supportedCamelPhases, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SupportedCamelPhases }, { &hf_camel_offeredCamel4Functionalities, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OfferedCamel4Functionalities }, { &hf_camel_extensions , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_Extensions }, + { &hf_camel_releaseCallArgExtensionAllowed, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -5633,13 +5640,50 @@ dissect_camel_PlayToneArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs static int -dissect_camel_ReleaseCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_camel_AllCallSegments(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_camel_Cause(implicit_tag, tvb, offset, actx, tree, hf_index); return offset; } +static const ber_sequence_t AllCallSegmentsWithExtension_sequence[] = { + { &hf_camel_allCallSegments, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_camel_AllCallSegments }, + { &hf_camel_extensions , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_Extensions }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_camel_AllCallSegmentsWithExtension(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + AllCallSegmentsWithExtension_sequence, hf_index, ett_camel_AllCallSegmentsWithExtension); + + return offset; +} + + +static const value_string camel_ReleaseCallArg_vals[] = { + { 0, "allCallSegments" }, + { 1, "allCallSegmentsWithExtension" }, + { 0, NULL } +}; + +static const ber_choice_t ReleaseCallArg_choice[] = { + { 0, &hf_camel_allCallSegments, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_camel_AllCallSegments }, + { 1, &hf_camel_allCallSegmentsWithExtension, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_camel_AllCallSegmentsWithExtension }, + { 0, NULL, 0, 0, 0, NULL } +}; + +static int +dissect_camel_ReleaseCallArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_choice(actx, tree, tvb, offset, + ReleaseCallArg_choice, hf_index, ett_camel_ReleaseCallArg, + NULL); + + return offset; +} + + static const ber_sequence_t SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent_sequence_of[1] = { { &hf_camel_bcsmEvents_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_camel_BCSMEvent }, }; @@ -5845,7 +5889,7 @@ static const ber_sequence_t InitialDPGPRSArg_sequence[] = { { &hf_camel_endUserAddress, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_EndUserAddress }, { &hf_camel_qualityOfService, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_QualityOfService }, { &hf_camel_accessPointName, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_AccessPointName }, - { &hf_camel_routeingAreaIdentity, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RAIdentity }, + { &hf_camel_routeingAreaIdentity, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_RAIdentity }, { &hf_camel_chargingID , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GPRSChargingID }, { &hf_camel_sGSNCapabilities, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_SGSNCapabilities }, { &hf_camel_locationInformationGPRS, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_LocationInformationGPRS }, @@ -7443,7 +7487,7 @@ void proto_register_camel(void) { NULL, HFILL }}, { &hf_camel_ReleaseCallArg_PDU, { "ReleaseCallArg", "camel.ReleaseCallArg", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, VALS(camel_ReleaseCallArg_vals), 0, NULL, HFILL }}, { &hf_camel_RequestReportBCSMEventArg_PDU, { "RequestReportBCSMEventArg", "camel.RequestReportBCSMEventArg", @@ -8945,6 +8989,10 @@ void proto_register_camel(void) { { "collectInformationAllowed", "camel.collectInformationAllowed", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_camel_releaseCallArgExtensionAllowed, + { "releaseCallArgExtensionAllowed", "camel.releaseCallArgExtensionAllowed", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_camel_legToBeCreated, { "legToBeCreated", "camel.legToBeCreated", FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, @@ -8965,6 +9013,14 @@ void proto_register_camel(void) { { "legIDToMove", "camel.legIDToMove", FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0, "LegID", HFILL }}, + { &hf_camel_allCallSegments, + { "allCallSegments", "camel.allCallSegments", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_camel_allCallSegmentsWithExtension, + { "allCallSegmentsWithExtension", "camel.allCallSegmentsWithExtension", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_camel_bcsmEvents, { "bcsmEvents", "camel.bcsmEvents", FT_UINT32, BASE_DEC, NULL, 0, @@ -9372,6 +9428,8 @@ void proto_register_camel(void) { &ett_camel_InitiateCallAttemptRes, &ett_camel_MoveLegArg, &ett_camel_PlayToneArg, + &ett_camel_ReleaseCallArg, + &ett_camel_AllCallSegmentsWithExtension, &ett_camel_RequestReportBCSMEventArg, &ett_camel_SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent, &ett_camel_ResetTimerArg, diff --git a/epan/dissectors/packet-camel.h b/epan/dissectors/packet-camel.h index e3ac21f059..3228a69937 100644 --- a/epan/dissectors/packet-camel.h +++ b/epan/dissectors/packet-camel.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-camel.h */ -/* ../../tools/asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ +/* ../../tools/asn2wrs.py -b -L -p camel -c ./camel.cnf -s ./packet-camel-template -D . -O ../../epan/dissectors CAP-object-identifiers.asn CAP-classes.asn CAP-datatypes.asn CAP-errorcodes.asn CAP-errortypes.asn CAP-operationcodes.asn CAP-GPRS-ReferenceNumber.asn CAP-gsmSCF-gsmSRF-ops-args.asn CAP-gsmSSF-gsmSCF-ops-args.asn CAP-gprsSSF-gsmSCF-ops-args.asn CAP-SMS-ops-args.asn CAP-U-ABORT-Data.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */ /* Input file: packet-camel-template.h */ diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index a46de2f49f..43dedcc08a 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-gsm_map.c */ -/* ../../tools/asn2wrs.py -b -e -c ./gsm_map.cnf -s ./packet-gsm_map-template -D . ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ +/* ../../tools/asn2wrs.py -b -e -c ./gsm_map.cnf -s ./packet-gsm_map-template -D . -O ../../epan/dissectors ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ /* Input file: packet-gsm_map-template.c */ @@ -289,9 +289,12 @@ static int hf_gsm_map_sm_gprsSupportIndicator = -1; /* NULL */ static int hf_gsm_map_sm_sm_RP_MTI = -1; /* SM_RP_MTI */ static int hf_gsm_map_sm_sm_RP_SMEA = -1; /* SM_RP_SMEA */ static int hf_gsm_map_sm_sm_deliveryNotIntended = -1; /* SM_DeliveryNotIntended */ +static int hf_gsm_map_sm_ip_sm_gwGuidanceIndicator = -1; /* NULL */ static int hf_gsm_map_sm_imsi = -1; /* IMSI */ static int hf_gsm_map_sm_locationInfoWithLMSI = -1; /* LocationInfoWithLMSI */ -static int hf_gsm_map_sm_mwd_Set = -1; /* BOOLEAN */ +static int hf_gsm_map_sm_ip_sm_gwGuidance = -1; /* IP_SM_GW_Guidance */ +static int hf_gsm_map_sm_minimumDeliveryTimeValue = -1; /* SM_DeliveryTimerValue */ +static int hf_gsm_map_sm_recommendedDeliveryTimeValue = -1; /* SM_DeliveryTimerValue */ static int hf_gsm_map_sm_networkNode_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_sm_lmsi = -1; /* LMSI */ static int hf_gsm_map_sm_gprsNodeIndicator = -1; /* NULL */ @@ -302,6 +305,8 @@ static int hf_gsm_map_sm_sm_RP_DA = -1; /* SM_RP_DA */ static int hf_gsm_map_sm_sm_RP_OA = -1; /* SM_RP_OA */ static int hf_gsm_map_sm_sm_RP_UI = -1; /* SignalInfo */ static int hf_gsm_map_sm_moreMessagesToSend = -1; /* NULL */ +static int hf_gsm_map_sm_smDeliveryTimer = -1; /* SM_DeliveryTimerValue */ +static int hf_gsm_map_sm_smDeliveryStartTime = -1; /* Time */ static int hf_gsm_map_sm_serviceCentreAddressDA = -1; /* AddressString */ static int hf_gsm_map_sm_noSM_RP_DA = -1; /* NULL */ static int hf_gsm_map_sm_msisdn_01 = -1; /* T_msisdn */ @@ -343,6 +348,27 @@ static int hf_gsm_map_om_traceNE_TypeList = -1; /* TraceNE_TypeList */ static int hf_gsm_map_om_traceInterfaceList = -1; /* TraceInterfaceList */ static int hf_gsm_map_om_traceEventList = -1; /* TraceEventList */ static int hf_gsm_map_om_traceCollectionEntity = -1; /* GSN_Address */ +static int hf_gsm_map_om_mdt_Configuration = -1; /* MDT_Configuration */ +static int hf_gsm_map_om_jobType = -1; /* JobType */ +static int hf_gsm_map_om_areaScope = -1; /* AreaScope */ +static int hf_gsm_map_om_listOfMeasurements = -1; /* ListOfMeasurements */ +static int hf_gsm_map_om_reportingTrigger = -1; /* ReportingTrigger */ +static int hf_gsm_map_om_reportInterval = -1; /* ReportInterval */ +static int hf_gsm_map_om_reportAmount = -1; /* ReportAmount */ +static int hf_gsm_map_om_eventThresholdRSRP = -1; /* EventThresholdRSRP */ +static int hf_gsm_map_om_eventThresholdRSRQ = -1; /* EventThresholdRSRQ */ +static int hf_gsm_map_om_loggingInterval = -1; /* LoggingInterval */ +static int hf_gsm_map_om_loggingDuration = -1; /* LoggingDuration */ +static int hf_gsm_map_om_cgi_List = -1; /* CGI_List */ +static int hf_gsm_map_om_e_utran_cgi_List = -1; /* E_UTRAN_CGI_List */ +static int hf_gsm_map_om_routingAreaId_List = -1; /* RoutingAreaId_List */ +static int hf_gsm_map_om_locationAreaId_List = -1; /* LocationAreaId_List */ +static int hf_gsm_map_om_trackingAreaId_List = -1; /* TrackingAreaId_List */ +static int hf_gsm_map_om_CGI_List_item = -1; /* GlobalCellId */ +static int hf_gsm_map_om_E_UTRAN_CGI_List_item = -1; /* E_UTRAN_CGI */ +static int hf_gsm_map_om_RoutingAreaId_List_item = -1; /* RAIdentity */ +static int hf_gsm_map_om_LocationAreaId_List_item = -1; /* LAIFixedLength */ +static int hf_gsm_map_om_TrackingAreaId_List_item = -1; /* TA_Id */ static int hf_gsm_map_om_msc_s_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_mgw_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_sgsn_TraceDepth = -1; /* TraceDepth */ @@ -492,6 +518,7 @@ static int hf_gsm_map_ms_supportedLCS_CapabilitySets = -1; /* SupportedLCS_Capa static int hf_gsm_map_ms_offeredCamel4CSIs = -1; /* OfferedCamel4CSIs */ static int hf_gsm_map_ms_supportedRAT_TypesIndicator = -1; /* SupportedRAT_Types */ static int hf_gsm_map_ms_longGroupID_Supported = -1; /* NULL */ +static int hf_gsm_map_ms_mtRoamingForwardingSupported = -1; /* NULL */ static int hf_gsm_map_ms_sendSubscriberData = -1; /* NULL */ static int hf_gsm_map_ms_subscriberDataStored = -1; /* AgeIndicator */ static int hf_gsm_map_ms_hlr_Number = -1; /* ISDN_AddressString */ @@ -504,6 +531,11 @@ static int hf_gsm_map_ms_lac = -1; /* LAC */ static int hf_gsm_map_ms_identity = -1; /* Identity */ static int hf_gsm_map_ms_cancellationType = -1; /* CancellationType */ static int hf_gsm_map_ms_typeOfUpdate = -1; /* TypeOfUpdate */ +static int hf_gsm_map_ms_mtrf_SupportedAndAuthorized = -1; /* NULL */ +static int hf_gsm_map_ms_mtrf_SupportedAndNotAuthorized = -1; /* NULL */ +static int hf_gsm_map_ms_newMSC_Number = -1; /* ISDN_AddressString */ +static int hf_gsm_map_ms_newVLR_Number = -1; /* ISDN_AddressString */ +static int hf_gsm_map_ms_new_lmsi = -1; /* LMSI */ static int hf_gsm_map_ms_sgsn_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_ms_freezeTMSI = -1; /* NULL */ static int hf_gsm_map_ms_freezeP_TMSI = -1; /* NULL */ @@ -544,6 +576,7 @@ static int hf_gsm_map_ms_nodeTypeIndicator = -1; /* NULL */ static int hf_gsm_map_ms_areaRestricted = -1; /* NULL */ static int hf_gsm_map_ms_ue_reachableIndicator = -1; /* NULL */ static int hf_gsm_map_ms_epsSubscriptionDataNotNeeded = -1; /* NULL */ +static int hf_gsm_map_ms_ue_srvcc_Capability = -1; /* UE_SRVCC_Capability */ static int hf_gsm_map_ms_pdn_gw_update = -1; /* PDN_GW_Update */ static int hf_gsm_map_ms_isr_Information = -1; /* ISR_Information */ static int hf_gsm_map_ms_apn = -1; /* APN */ @@ -585,6 +618,9 @@ static int hf_gsm_map_ms_asciCallReference = -1; /* ASCI_CallReference */ static int hf_gsm_map_ms_geran_classmark = -1; /* GERAN_Classmark */ static int hf_gsm_map_ms_iuCurrentlyUsedCodec = -1; /* Codec */ static int hf_gsm_map_ms_uesbi_Iu = -1; /* UESBI_Iu */ +static int hf_gsm_map_ms_regionalSubscriptionData = -1; /* ZoneCodeList */ +static int hf_gsm_map_ms_globalCallReference = -1; /* LCLS_GlobalCallReference */ +static int hf_gsm_map_ms_lcls_Negotiation = -1; /* LCLS_Negotiation */ static int hf_gsm_map_ms_BSSMAP_ServiceHandoverList_item = -1; /* BSSMAP_ServiceHandoverInfo */ static int hf_gsm_map_ms_RadioResourceList_item = -1; /* RadioResource */ static int hf_gsm_map_ms_handoverNumber = -1; /* ISDN_AddressString */ @@ -641,11 +677,15 @@ static int hf_gsm_map_ms_uesbi_IuB = -1; /* UESBI_IuB */ static int hf_gsm_map_ms_CSG_SubscriptionDataList_item = -1; /* CSG_SubscriptionData */ static int hf_gsm_map_ms_csg_Id = -1; /* CSG_Id */ static int hf_gsm_map_ms_expirationDate = -1; /* Time */ +static int hf_gsm_map_ms_lipa_AllowedAPNList = -1; /* LIPA_AllowedAPNList */ +static int hf_gsm_map_ms_LIPA_AllowedAPNList_item = -1; /* APN */ static int hf_gsm_map_ms_apn_oi_Replacement = -1; /* APN_OI_Replacement */ static int hf_gsm_map_ms_rfsp_id = -1; /* RFSP_ID */ static int hf_gsm_map_ms_ambr = -1; /* AMBR */ static int hf_gsm_map_ms_apn_ConfigurationProfile = -1; /* APN_ConfigurationProfile */ static int hf_gsm_map_ms_stn_sr = -1; /* ISDN_AddressString */ +static int hf_gsm_map_ms_mps_CSPriority = -1; /* NULL */ +static int hf_gsm_map_ms_mps_EPSPriority = -1; /* NULL */ static int hf_gsm_map_ms_defaultContext = -1; /* ContextId */ static int hf_gsm_map_ms_completeDataListIncluded = -1; /* NULL */ static int hf_gsm_map_ms_epsDataList = -1; /* EPS_DataList */ @@ -658,6 +698,8 @@ static int hf_gsm_map_ms_vplmnAddressAllowed = -1; /* NULL */ static int hf_gsm_map_ms_chargingCharacteristics = -1; /* ChargingCharacteristics */ static int hf_gsm_map_ms_specificAPNInfoList = -1; /* SpecificAPNInfoList */ static int hf_gsm_map_ms_servedPartyIP_IPv6_Address = -1; /* PDP_Address */ +static int hf_gsm_map_ms_sipto_Permission = -1; /* SIPTO_Permission */ +static int hf_gsm_map_ms_lipa_Permission = -1; /* LIPA_Permission */ static int hf_gsm_map_ms_qos_Class_Identifier = -1; /* QoS_Class_Identifier */ static int hf_gsm_map_ms_allocation_Retention_Priority = -1; /* Allocation_Retention_Priority */ static int hf_gsm_map_ms_max_RequestedBandwidth_UL = -1; /* Bandwidth */ @@ -715,7 +757,6 @@ static int hf_gsm_map_ms_teleserviceList = -1; /* TeleserviceList */ static int hf_gsm_map_ms_provisionedSS = -1; /* Ext_SS_InfoList */ static int hf_gsm_map_ms_odb_Data = -1; /* ODB_Data */ static int hf_gsm_map_ms_roamingRestrictionDueToUnsupportedFeature = -1; /* NULL */ -static int hf_gsm_map_ms_regionalSubscriptionData = -1; /* ZoneCodeList */ static int hf_gsm_map_ms_vbsSubscriptionData = -1; /* VBSDataList */ static int hf_gsm_map_ms_vgcsSubscriptionData = -1; /* VGCSDataList */ static int hf_gsm_map_ms_vlrCamelSubscriptionInfo = -1; /* VlrCamelSubscriptionInfo */ @@ -882,6 +923,7 @@ static int hf_gsm_map_ms_ms_classmark = -1; /* NULL */ static int hf_gsm_map_ms_mnpRequestedInfo = -1; /* NULL */ static int hf_gsm_map_ms_t_adsData = -1; /* NULL */ static int hf_gsm_map_ms_requestedNodes = -1; /* RequestedNodes */ +static int hf_gsm_map_ms_servingNodeIndication = -1; /* NULL */ static int hf_gsm_map_ms_ageOfLocationInformation = -1; /* AgeOfLocationInformation */ static int hf_gsm_map_ms_geographicalInformation = -1; /* GeographicalInformation */ static int hf_gsm_map_ms_vlr_number = -1; /* ISDN_AddressString */ @@ -892,8 +934,9 @@ static int hf_gsm_map_ms_geodeticInformation = -1; /* GeodeticInformation */ static int hf_gsm_map_ms_currentLocationRetrieved = -1; /* NULL */ static int hf_gsm_map_ms_sai_Present = -1; /* NULL */ static int hf_gsm_map_ms_userCSGInformation = -1; /* UserCSGInformation */ -static int hf_gsm_map_ms_e_utranCellGlobalIdentity = -1; /* OCTET_STRING_SIZE_7 */ -static int hf_gsm_map_ms_trackingAreaIdentity = -1; /* OCTET_STRING_SIZE_5 */ +static int hf_gsm_map_ms_e_utranCellGlobalIdentity = -1; /* E_UTRAN_CGI */ +static int hf_gsm_map_ms_trackingAreaIdentity = -1; /* TA_Id */ +static int hf_gsm_map_ms_mme_Name = -1; /* DiameterIdentity */ static int hf_gsm_map_ms_routeingAreaIdentity = -1; /* RAIdentity */ static int hf_gsm_map_ms_selectedLSAIdentity = -1; /* LSAIdentity */ static int hf_gsm_map_ms_accessMode = -1; /* OCTET_STRING_SIZE_1 */ @@ -943,6 +986,15 @@ static int hf_gsm_map_ms_offeredCamel4CSIsInVLR = -1; /* OfferedCamel4CSIs */ static int hf_gsm_map_ms_offeredCamel4CSIsInSGSN = -1; /* OfferedCamel4CSIs */ static int hf_gsm_map_ms_msisdn_BS_List = -1; /* MSISDN_BS_List */ static int hf_gsm_map_ms_csg_SubscriptionDataList = -1; /* CSG_SubscriptionDataList */ +static int hf_gsm_map_ms_cw_Data = -1; /* CallWaitingData */ +static int hf_gsm_map_ms_ch_Data = -1; /* CallHoldData */ +static int hf_gsm_map_ms_clip_Data = -1; /* ClipData */ +static int hf_gsm_map_ms_clir_Data = -1; /* ClirData */ +static int hf_gsm_map_ms_ect_data = -1; /* EctData */ +static int hf_gsm_map_ms_cwFeatureList = -1; /* Ext_CwFeatureList */ +static int hf_gsm_map_ms_Ext_CwFeatureList_item = -1; /* Ext_CwFeature */ +static int hf_gsm_map_ms_overrideCategory = -1; /* OverrideCategory */ +static int hf_gsm_map_ms_cliRestrictionOption = -1; /* CliRestrictionOption */ static int hf_gsm_map_ms_requestedSS_Info = -1; /* SS_ForBS_Code */ static int hf_gsm_map_ms_odb = -1; /* NULL */ static int hf_gsm_map_ms_requestedCAMEL_SubscriptionInfo = -1; /* RequestedCAMEL_SubscriptionInfo */ @@ -951,6 +1003,11 @@ static int hf_gsm_map_ms_supportedSGSN_CAMEL_Phases_01 = -1; /* NULL */ static int hf_gsm_map_ms_additionalRequestedCAMEL_SubscriptionInfo = -1; /* AdditionalRequestedCAMEL_SubscriptionInfo */ static int hf_gsm_map_ms_msisdn_BS_List_01 = -1; /* NULL */ static int hf_gsm_map_ms_csg_SubscriptionDataRequested = -1; /* NULL */ +static int hf_gsm_map_ms_cw_Info = -1; /* NULL */ +static int hf_gsm_map_ms_clip_Info = -1; /* NULL */ +static int hf_gsm_map_ms_clir_Info = -1; /* NULL */ +static int hf_gsm_map_ms_hold_Info = -1; /* NULL */ +static int hf_gsm_map_ms_ect_Info = -1; /* NULL */ static int hf_gsm_map_ms_MSISDN_BS_List_item = -1; /* MSISDN_BS */ static int hf_gsm_map_ms_password = -1; /* Password */ static int hf_gsm_map_ms_wrongPasswordAttemptsCounter = -1; /* WrongPasswordAttemptsCounter */ @@ -968,10 +1025,16 @@ static int hf_gsm_map_ms_modificationRequestFor_CB_Info = -1; /* ModificationRe static int hf_gsm_map_ms_modificationRequestFor_CSI = -1; /* ModificationRequestFor_CSI */ static int hf_gsm_map_ms_modificationRequestFor_ODB_data = -1; /* ModificationRequestFor_ODB_data */ static int hf_gsm_map_ms_modificationRequestFor_IP_SM_GW_Data = -1; /* ModificationRequestFor_IP_SM_GW_Data */ -static int hf_gsm_map_ms_activationRequestForUE_reachability = -1; /* ServingNode */ +static int hf_gsm_map_ms_activationRequestForUE_reachability = -1; /* RequestedServingNode */ static int hf_gsm_map_ms_modificationRequestFor_CSG = -1; /* ModificationRequestFor_CSG */ +static int hf_gsm_map_ms_modificationRequestFor_CW_Data = -1; /* ModificationRequestFor_CW_Info */ +static int hf_gsm_map_ms_modificationRequestFor_CLIP_Data = -1; /* ModificationRequestFor_CLIP_Info */ +static int hf_gsm_map_ms_modificationRequestFor_CLIR_Data = -1; /* ModificationRequestFor_CLIR_Info */ +static int hf_gsm_map_ms_modificationRequestFor_HOLD_Data = -1; /* ModificationRequestFor_CH_Info */ +static int hf_gsm_map_ms_modificationRequestFor_ECT_Data = -1; /* ModificationRequestFor_ECT_Info */ static int hf_gsm_map_ms_modifyNotificationToCSE = -1; /* ModificationInstruction */ static int hf_gsm_map_ms_ss_InfoFor_CSE = -1; /* Ext_SS_InfoFor_CSE */ +static int hf_gsm_map_ms_serviceCentreAddress = -1; /* AddressString */ static int hf_gsm_map_ms_forwardedToNumber_01 = -1; /* AddressString */ static int hf_gsm_map_ms_odb_data = -1; /* ODB_Data */ static int hf_gsm_map_ms_requestedCamel_SubscriptionInfo = -1; /* RequestedCAMEL_SubscriptionInfo */ @@ -1000,7 +1063,10 @@ static int hf_gsm_map_ms_accessRestrictionData = -1; /* AccessRestrictionData * static int hf_gsm_map_ms_ics_Indicator = -1; /* BOOLEAN */ static int hf_gsm_map_ms_eps_SubscriptionData = -1; /* EPS_SubscriptionData */ static int hf_gsm_map_ms_ue_ReachabilityRequestIndicator = -1; /* NULL */ -static int hf_gsm_map_ms_mme_Name = -1; /* DiameterIdentity */ +static int hf_gsm_map_ms_subscribedPeriodicRAUTAUtimer = -1; /* SubscribedPeriodicRAUTAUtimer */ +static int hf_gsm_map_ms_vplmnLIPAAllowed = -1; /* NULL */ +static int hf_gsm_map_ms_mdtUserConsent = -1; /* BOOLEAN */ +static int hf_gsm_map_ms_subscribedPeriodicLAUtimer = -1; /* SubscribedPeriodicLAUtimer */ /* named bits */ static int hf_gsm_map_ms_SupportedRAT_Types_utran = -1; static int hf_gsm_map_ms_SupportedRAT_Types_geran = -1; @@ -1041,6 +1107,11 @@ static int hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls = -1; static int hf_gsm_map_ms_SupportedFeatures_baoc = -1; static int hf_gsm_map_ms_SupportedFeatures_boic = -1; static int hf_gsm_map_ms_SupportedFeatures_boicExHC = -1; +static int hf_gsm_map_ms_LCLS_Negotiation_permission_indicator = -1; +static int hf_gsm_map_ms_LCLS_Negotiation_forward_data_sending_indicator = -1; +static int hf_gsm_map_ms_LCLS_Negotiation_backward_sending_indicator = -1; +static int hf_gsm_map_ms_LCLS_Negotiation_forward_data_reception_indicator = -1; +static int hf_gsm_map_ms_LCLS_Negotiation_backward_data_reception_indicator = -1; static int hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus = -1; static int hf_gsm_map_ms_RequestedEquipmentInfo_bmuef = -1; static int hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed = -1; @@ -1132,7 +1203,9 @@ static int hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest = -1; static int hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset = -1; static int hf_gsm_map_ms_RequestedNodes_mme = -1; static int hf_gsm_map_ms_RequestedNodes_sgsn = -1; +static int hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn = -1; static int hf_gsm_map_ms_ServingNode_mme = -1; +static int hf_gsm_map_ms_ServingNode_sgsn = -1; /* --- Module MAP-CH-DataTypes --- --- --- */ @@ -1204,6 +1277,8 @@ static int hf_gsm_map_ch_supportedCamelPhasesInInterrogatingNode = -1; /* Suppo static int hf_gsm_map_ch_orNotSupportedInGMSC = -1; /* NULL */ static int hf_gsm_map_ch_offeredCamel4CSIsInInterrogatingNode = -1; /* OfferedCamel4CSIs */ static int hf_gsm_map_ch_pagingArea = -1; /* PagingArea */ +static int hf_gsm_map_ch_mtrf_Indicator = -1; /* NULL */ +static int hf_gsm_map_ch_oldMSC_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_ch_o_CSI = -1; /* O_CSI */ static int hf_gsm_map_ch_uu_Data = -1; /* UU_Data */ static int hf_gsm_map_ch_allInformationSent = -1; /* NULL */ @@ -1722,6 +1797,7 @@ static gint ett_gsm_map_er_OngoingGroupCallParam = -1; static gint ett_gsm_map_sm_RoutingInfoForSM_Arg = -1; static gint ett_gsm_map_sm_RoutingInfoForSM_Res = -1; +static gint ett_gsm_map_sm_IP_SM_GW_Guidance = -1; static gint ett_gsm_map_sm_LocationInfoWithLMSI = -1; static gint ett_gsm_map_sm_Additional_Number = -1; static gint ett_gsm_map_sm_MO_ForwardSM_Arg = -1; @@ -1744,6 +1820,13 @@ static gint ett_gsm_map_sm_DispatcherList = -1; /* --- Module MAP-OM-DataTypes --- --- --- */ static gint ett_gsm_map_om_ActivateTraceModeArg = -1; +static gint ett_gsm_map_om_MDT_Configuration = -1; +static gint ett_gsm_map_om_AreaScope = -1; +static gint ett_gsm_map_om_CGI_List = -1; +static gint ett_gsm_map_om_E_UTRAN_CGI_List = -1; +static gint ett_gsm_map_om_RoutingAreaId_List = -1; +static gint ett_gsm_map_om_LocationAreaId_List = -1; +static gint ett_gsm_map_om_TrackingAreaId_List = -1; static gint ett_gsm_map_om_TraceDepthList = -1; static gint ett_gsm_map_om_TraceNE_TypeList = -1; static gint ett_gsm_map_om_TraceInterfaceList = -1; @@ -1808,6 +1891,7 @@ static gint ett_gsm_map_ms_UpdateGprsLocationRes = -1; static gint ett_gsm_map_ms_ForwardAccessSignalling_Arg_U = -1; static gint ett_gsm_map_ms_AllowedUMTS_Algorithms = -1; static gint ett_gsm_map_ms_PrepareHO_Arg_U = -1; +static gint ett_gsm_map_ms_LCLS_Negotiation = -1; static gint ett_gsm_map_ms_BSSMAP_ServiceHandoverList = -1; static gint ett_gsm_map_ms_BSSMAP_ServiceHandoverInfo = -1; static gint ett_gsm_map_ms_RadioResourceList = -1; @@ -1837,6 +1921,7 @@ static gint ett_gsm_map_ms_UESBI_Iu = -1; static gint ett_gsm_map_ms_InsertSubscriberDataArg = -1; static gint ett_gsm_map_ms_CSG_SubscriptionDataList = -1; static gint ett_gsm_map_ms_CSG_SubscriptionData = -1; +static gint ett_gsm_map_ms_LIPA_AllowedAPNList = -1; static gint ett_gsm_map_ms_EPS_SubscriptionData = -1; static gint ett_gsm_map_ms_APN_ConfigurationProfile = -1; static gint ett_gsm_map_ms_EPS_DataList = -1; @@ -1970,6 +2055,13 @@ static gint ett_gsm_map_ms_AnyTimeInterrogationArg = -1; static gint ett_gsm_map_ms_AnyTimeInterrogationRes = -1; static gint ett_gsm_map_ms_AnyTimeSubscriptionInterrogationArg = -1; static gint ett_gsm_map_ms_AnyTimeSubscriptionInterrogationRes = -1; +static gint ett_gsm_map_ms_CallWaitingData = -1; +static gint ett_gsm_map_ms_Ext_CwFeatureList = -1; +static gint ett_gsm_map_ms_Ext_CwFeature = -1; +static gint ett_gsm_map_ms_ClipData = -1; +static gint ett_gsm_map_ms_ClirData = -1; +static gint ett_gsm_map_ms_CallHoldData = -1; +static gint ett_gsm_map_ms_EctData = -1; static gint ett_gsm_map_ms_RequestedSubscriptionInfo = -1; static gint ett_gsm_map_ms_MSISDN_BS_List = -1; static gint ett_gsm_map_ms_MSISDN_BS = -1; @@ -1978,7 +2070,13 @@ static gint ett_gsm_map_ms_CallBarringData = -1; static gint ett_gsm_map_ms_ODB_Info = -1; static gint ett_gsm_map_ms_CAMEL_SubscriptionInfo = -1; static gint ett_gsm_map_ms_AnyTimeModificationArg = -1; +static gint ett_gsm_map_ms_ModificationRequestFor_CW_Info = -1; +static gint ett_gsm_map_ms_ModificationRequestFor_CH_Info = -1; +static gint ett_gsm_map_ms_ModificationRequestFor_ECT_Info = -1; +static gint ett_gsm_map_ms_ModificationRequestFor_CLIR_Info = -1; +static gint ett_gsm_map_ms_ModificationRequestFor_CLIP_Info = -1; static gint ett_gsm_map_ms_ModificationRequestFor_CSG = -1; +static gint ett_gsm_map_ms_RequestedServingNode = -1; static gint ett_gsm_map_ms_ServingNode = -1; static gint ett_gsm_map_ms_AnyTimeModificationRes = -1; static gint ett_gsm_map_ms_ModificationRequestFor_CF_Info = -1; @@ -3348,6 +3446,16 @@ dissect_gsm_map_GSN_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of +static int +dissect_gsm_map_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + int dissect_gsm_map_IMSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_gsm_map_TBCD_STRING(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -3711,6 +3819,49 @@ dissect_gsm_map_PLMN_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset +static int +dissect_gsm_map_E_UTRAN_CGI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_TA_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +int +dissect_gsm_map_RAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 574 "../../asn1/gsm_map/gsm_map.cnf" + + tvbuff_t *parameter_tvb; + proto_tree *subtree; + + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + ¶meter_tvb); + + + if (!parameter_tvb) + return offset; + subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_RAIdentity); + de_gmm_rai(parameter_tvb, subtree, actx->pinfo, 0, 3, NULL,0); + + + + return offset; +} + + + int dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -5152,6 +5303,7 @@ static const value_string gsm_map_er_AbsentSubscriberReason_vals[] = { { 2, "noPageResponse" }, { 3, "purgedMS" }, { 4, "mtRoamingRetry" }, + { 5, "busySubscriber" }, { 0, NULL } }; @@ -5644,6 +5796,7 @@ static const ber_sequence_t gsm_map_sm_RoutingInfoForSM_Arg_sequence[] = { { &hf_gsm_map_sm_sm_RP_MTI, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_SM_RP_MTI }, { &hf_gsm_map_sm_sm_RP_SMEA, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_SM_RP_SMEA }, { &hf_gsm_map_sm_sm_deliveryNotIntended, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_SM_DeliveryNotIntended }, + { &hf_gsm_map_sm_ip_sm_gwGuidanceIndicator, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -5696,11 +5849,37 @@ dissect_gsm_map_sm_LocationInfoWithLMSI(gboolean implicit_tag _U_, tvbuff_t *tvb } + +static int +dissect_gsm_map_sm_SM_DeliveryTimerValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_sm_IP_SM_GW_Guidance_sequence[] = { + { &hf_gsm_map_sm_minimumDeliveryTimeValue, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_gsm_map_sm_SM_DeliveryTimerValue }, + { &hf_gsm_map_sm_recommendedDeliveryTimeValue, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_gsm_map_sm_SM_DeliveryTimerValue }, + { &hf_gsm_map_sm_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_sm_IP_SM_GW_Guidance(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_sm_IP_SM_GW_Guidance_sequence, hf_index, ett_gsm_map_sm_IP_SM_GW_Guidance); + + return offset; +} + + static const ber_sequence_t gsm_map_sm_RoutingInfoForSM_Res_sequence[] = { { &hf_gsm_map_sm_imsi , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_sm_locationInfoWithLMSI, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_LocationInfoWithLMSI }, - { &hf_gsm_map_sm_mwd_Set , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_BOOLEAN }, { &hf_gsm_map_sm_extensionContainer, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_sm_ip_sm_gwGuidance, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_IP_SM_GW_Guidance }, { NULL, 0, 0, 0, NULL } }; @@ -5850,6 +6029,8 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Arg_sequence[] = { { &hf_gsm_map_sm_sm_RP_UI , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_SignalInfo }, { &hf_gsm_map_sm_moreMessagesToSend, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_sm_NULL }, { &hf_gsm_map_sm_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_sm_smDeliveryTimer, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_sm_SM_DeliveryTimerValue }, + { &hf_gsm_map_sm_smDeliveryStartTime, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_Time }, { NULL, 0, 0, 0, NULL } }; @@ -6591,6 +6772,278 @@ dissect_gsm_map_om_TraceEventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } +static const value_string gsm_map_om_JobType_vals[] = { + { 0, "immediate-MDT-only" }, + { 1, "logged-MDT-only" }, + { 2, "trace-only" }, + { 3, "immediate-MDT-and-trace" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_om_JobType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_CGI_List_sequence_of[1] = { + { &hf_gsm_map_om_CGI_List_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_GlobalCellId }, +}; + +static int +dissect_gsm_map_om_CGI_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_CGI_List_sequence_of, hf_index, ett_gsm_map_om_CGI_List); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_E_UTRAN_CGI_List_sequence_of[1] = { + { &hf_gsm_map_om_E_UTRAN_CGI_List_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_E_UTRAN_CGI }, +}; + +static int +dissect_gsm_map_om_E_UTRAN_CGI_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_E_UTRAN_CGI_List_sequence_of, hf_index, ett_gsm_map_om_E_UTRAN_CGI_List); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_RoutingAreaId_List_sequence_of[1] = { + { &hf_gsm_map_om_RoutingAreaId_List_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_RAIdentity }, +}; + +static int +dissect_gsm_map_om_RoutingAreaId_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_RoutingAreaId_List_sequence_of, hf_index, ett_gsm_map_om_RoutingAreaId_List); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_LocationAreaId_List_sequence_of[1] = { + { &hf_gsm_map_om_LocationAreaId_List_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_LAIFixedLength }, +}; + +static int +dissect_gsm_map_om_LocationAreaId_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_LocationAreaId_List_sequence_of, hf_index, ett_gsm_map_om_LocationAreaId_List); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_TrackingAreaId_List_sequence_of[1] = { + { &hf_gsm_map_om_TrackingAreaId_List_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_TA_Id }, +}; + +static int +dissect_gsm_map_om_TrackingAreaId_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_TrackingAreaId_List_sequence_of, hf_index, ett_gsm_map_om_TrackingAreaId_List); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_AreaScope_sequence[] = { + { &hf_gsm_map_om_cgi_List , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_CGI_List }, + { &hf_gsm_map_om_e_utran_cgi_List, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_E_UTRAN_CGI_List }, + { &hf_gsm_map_om_routingAreaId_List, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_RoutingAreaId_List }, + { &hf_gsm_map_om_locationAreaId_List, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_LocationAreaId_List }, + { &hf_gsm_map_om_trackingAreaId_List, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TrackingAreaId_List }, + { &hf_gsm_map_om_extensionContainer, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_om_AreaScope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_AreaScope_sequence, hf_index, ett_gsm_map_om_AreaScope); + + return offset; +} + + + +static int +dissect_gsm_map_om_ListOfMeasurements(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_om_ReportingTrigger(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const value_string gsm_map_om_ReportInterval_vals[] = { + { 0, "umts250ms" }, + { 1, "umts500ms" }, + { 2, "umts1000ms" }, + { 3, "umts2000ms" }, + { 4, "umts3000ms" }, + { 5, "umts4000ms" }, + { 6, "umts6000ms" }, + { 7, "umts8000ms" }, + { 8, "umts12000ms" }, + { 9, "umts16000ms" }, + { 10, "umts20000ms" }, + { 11, "umts24000ms" }, + { 12, "umts28000ms" }, + { 13, "umts32000ms" }, + { 14, "umts64000ms" }, + { 15, "lte120ms" }, + { 16, "lte240ms" }, + { 17, "lte480ms" }, + { 18, "lte640ms" }, + { 19, "lte1024ms" }, + { 20, "lte2048ms" }, + { 21, "lte5120ms" }, + { 22, "lte10240ms" }, + { 23, "lte1min" }, + { 24, "lte6min" }, + { 25, "lte12min" }, + { 26, "lte30min" }, + { 27, "lte60min" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_om_ReportInterval(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const value_string gsm_map_om_ReportAmount_vals[] = { + { 0, "d1" }, + { 1, "d2" }, + { 2, "d4" }, + { 3, "d8" }, + { 4, "d16" }, + { 5, "d32" }, + { 6, "d64" }, + { 7, "infinity" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_om_ReportAmount(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_om_EventThresholdRSRP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_om_EventThresholdRSRQ(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const value_string gsm_map_om_LoggingInterval_vals[] = { + { 0, "d1dot28" }, + { 1, "d2dot56" }, + { 2, "d5dot12" }, + { 3, "d10dot24" }, + { 4, "d20dot48" }, + { 5, "d30dot72" }, + { 6, "d40dot96" }, + { 7, "d61dot44" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_om_LoggingInterval(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const value_string gsm_map_om_LoggingDuration_vals[] = { + { 0, "d600sec" }, + { 1, "d1200sec" }, + { 2, "d2400sec" }, + { 3, "d3600sec" }, + { 4, "d5400sec" }, + { 5, "d7200sec" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_om_LoggingDuration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_om_MDT_Configuration_sequence[] = { + { &hf_gsm_map_om_jobType , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_gsm_map_om_JobType }, + { &hf_gsm_map_om_areaScope, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_om_AreaScope }, + { &hf_gsm_map_om_listOfMeasurements, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_om_ListOfMeasurements }, + { &hf_gsm_map_om_reportingTrigger, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_ReportingTrigger }, + { &hf_gsm_map_om_reportInterval, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_om_ReportInterval }, + { &hf_gsm_map_om_reportAmount, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_ReportAmount }, + { &hf_gsm_map_om_eventThresholdRSRP, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_om_EventThresholdRSRP }, + { &hf_gsm_map_om_eventThresholdRSRQ, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_EventThresholdRSRQ }, + { &hf_gsm_map_om_loggingInterval, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_LoggingInterval }, + { &hf_gsm_map_om_loggingDuration, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_LoggingDuration }, + { &hf_gsm_map_om_extensionContainer, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_om_MDT_Configuration(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_MDT_Configuration_sequence, hf_index, ett_gsm_map_om_MDT_Configuration); + + return offset; +} + + static const ber_sequence_t gsm_map_om_ActivateTraceModeArg_sequence[] = { { &hf_gsm_map_om_imsi , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_om_traceReference, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceReference }, @@ -6603,6 +7056,7 @@ static const ber_sequence_t gsm_map_om_ActivateTraceModeArg_sequence[] = { { &hf_gsm_map_om_traceInterfaceList, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceInterfaceList }, { &hf_gsm_map_om_traceEventList, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceEventList }, { &hf_gsm_map_om_traceCollectionEntity, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, + { &hf_gsm_map_om_mdt_Configuration, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MDT_Configuration }, { NULL, 0, 0, 0, NULL } }; @@ -6853,6 +7307,7 @@ static const ber_sequence_t gsm_map_ms_VLR_Capability_sequence[] = { { &hf_gsm_map_ms_offeredCamel4CSIs, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OfferedCamel4CSIs }, { &hf_gsm_map_ms_supportedRAT_TypesIndicator, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SupportedRAT_Types }, { &hf_gsm_map_ms_longGroupID_Supported, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_mtRoamingForwardingSupported, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -7006,6 +7461,11 @@ static const ber_sequence_t gsm_map_ms_CancelLocationArg_U_sequence[] = { { &hf_gsm_map_ms_cancellationType, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_CancellationType }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ms_typeOfUpdate, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_TypeOfUpdate }, + { &hf_gsm_map_ms_mtrf_SupportedAndAuthorized, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_mtrf_SupportedAndNotAuthorized, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_newMSC_Number, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_ms_newVLR_Number, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_ms_new_lmsi , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_LMSI }, { NULL, 0, 0, 0, NULL } }; @@ -7114,6 +7574,9 @@ static const ber_sequence_t gsm_map_ms_SendIdentificationArg_sequence[] = { { &hf_gsm_map_ms_msc_Number, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_ms_previous_LAI, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_LAIFixedLength }, { &hf_gsm_map_ms_hopCounter, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_HopCounter }, + { &hf_gsm_map_ms_mtRoamingForwardingSupported, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_newVLR_Number, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_ms_new_lmsi , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_LMSI }, { NULL, 0, 0, 0, NULL } }; @@ -7697,6 +8160,22 @@ dissect_gsm_map_ms_Used_RAT_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i } +static const value_string gsm_map_ms_UE_SRVCC_Capability_vals[] = { + { 0, "ue-srvcc-not-supported" }, + { 1, "ue-srvcc-supported" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_ms_UE_SRVCC_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_UpdateGprsLocationArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_ms_sgsn_Number, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, @@ -7716,6 +8195,7 @@ static const ber_sequence_t gsm_map_ms_UpdateGprsLocationArg_sequence[] = { { &hf_gsm_map_ms_areaRestricted, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_ue_reachableIndicator, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_epsSubscriptionDataNotNeeded, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_ue_srvcc_Capability, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_UE_SRVCC_Capability }, { NULL, 0, 0, 0, NULL } }; @@ -8155,6 +8635,58 @@ dissect_gsm_map_ms_UESBI_Iu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } + +static int +dissect_gsm_map_ms_ZoneCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ZoneCodeList_sequence_of[1] = { + { &hf_gsm_map_ms_ZoneCodeList_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_ZoneCode }, +}; + +static int +dissect_gsm_map_ms_ZoneCodeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ZoneCodeList_sequence_of, hf_index, ett_gsm_map_ms_ZoneCodeList); + + return offset; +} + + + +static int +dissect_gsm_map_ms_LCLS_GlobalCallReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const asn_namedbit gsm_map_ms_LCLS_Negotiation_bits[] = { + { 0, &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator, -1, -1, "permission-indicator", NULL }, + { 1, &hf_gsm_map_ms_LCLS_Negotiation_forward_data_sending_indicator, -1, -1, "forward-data-sending-indicator", NULL }, + { 2, &hf_gsm_map_ms_LCLS_Negotiation_backward_sending_indicator, -1, -1, "backward-sending-indicator", NULL }, + { 3, &hf_gsm_map_ms_LCLS_Negotiation_forward_data_reception_indicator, -1, -1, "forward-data-reception-indicator", NULL }, + { 4, &hf_gsm_map_ms_LCLS_Negotiation_backward_data_reception_indicator, -1, -1, "backward-data-reception-indicator", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_ms_LCLS_Negotiation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_LCLS_Negotiation_bits, hf_index, ett_gsm_map_ms_LCLS_Negotiation, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_PrepareHO_Arg_U_sequence[] = { { &hf_gsm_map_ms_targetCellId, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GlobalCellId }, { &hf_gsm_map_ms_ho_NumberNotRequired, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_NULL }, @@ -8183,6 +8715,9 @@ static const ber_sequence_t gsm_map_ms_PrepareHO_Arg_U_sequence[] = { { &hf_gsm_map_ms_alternativeChannelType, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RadioResourceInformation }, { &hf_gsm_map_ms_tracePropagationList, BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TracePropagationList }, { &hf_gsm_map_ms_aoipSupportedCodecsListAnchor, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodecsList }, + { &hf_gsm_map_ms_regionalSubscriptionData, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ZoneCodeList }, + { &hf_gsm_map_ms_globalCallReference, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LCLS_GlobalCallReference }, + { &hf_gsm_map_ms_lcls_Negotiation, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LCLS_Negotiation }, { NULL, 0, 0, 0, NULL } }; @@ -9139,29 +9674,6 @@ dissect_gsm_map_ms_ODB_Data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int -dissect_gsm_map_ms_ZoneCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - - -static const ber_sequence_t gsm_map_ms_ZoneCodeList_sequence_of[1] = { - { &hf_gsm_map_ms_ZoneCodeList_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_ZoneCode }, -}; - -static int -dissect_gsm_map_ms_ZoneCodeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_ZoneCodeList_sequence_of, hf_index, ett_gsm_map_ms_ZoneCodeList); - - return offset; -} - - - -static int dissect_gsm_map_ms_GroupId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_gsm_map_TBCD_STRING(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -10065,6 +10577,65 @@ dissect_gsm_map_ms_Ext_PDP_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } + +static int +dissect_gsm_map_ms_Bandwidth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_AMBR_sequence[] = { + { &hf_gsm_map_ms_max_RequestedBandwidth_UL, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Bandwidth }, + { &hf_gsm_map_ms_max_RequestedBandwidth_DL, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Bandwidth }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_AMBR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_AMBR_sequence, hf_index, ett_gsm_map_ms_AMBR); + + return offset; +} + + +static const value_string gsm_map_ms_SIPTO_Permission_vals[] = { + { 0, "siptoAllowed" }, + { 1, "siptoNotAllowed" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_ms_SIPTO_Permission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const value_string gsm_map_ms_LIPA_Permission_vals[] = { + { 0, "lipaProhibited" }, + { 1, "lipaOnly" }, + { 2, "lipaConditional" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_ms_LIPA_Permission(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_PDP_Context_sequence[] = { { &hf_gsm_map_ms_pdp_ContextId, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_ContextId }, { &hf_gsm_map_ms_pdp_Type , BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Type }, @@ -10081,6 +10652,9 @@ static const ber_sequence_t gsm_map_ms_PDP_Context_sequence[] = { { &hf_gsm_map_ms_apn_oi_Replacement, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN_OI_Replacement }, { &hf_gsm_map_ms_ext_pdp_Type, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_PDP_Type }, { &hf_gsm_map_ms_ext_pdp_Address, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Address }, + { &hf_gsm_map_ms_ambr , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AMBR }, + { &hf_gsm_map_ms_sipto_Permission, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SIPTO_Permission }, + { &hf_gsm_map_ms_lipa_Permission, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LIPA_Permission }, { NULL, 0, 0, 0, NULL } }; @@ -10610,32 +11184,6 @@ dissect_gsm_map_ms_RFSP_ID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int -dissect_gsm_map_ms_Bandwidth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - - -static const ber_sequence_t gsm_map_ms_AMBR_sequence[] = { - { &hf_gsm_map_ms_max_RequestedBandwidth_UL, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Bandwidth }, - { &hf_gsm_map_ms_max_RequestedBandwidth_DL, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Bandwidth }, - { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, - { NULL, 0, 0, 0, NULL } -}; - -static int -dissect_gsm_map_ms_AMBR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_AMBR_sequence, hf_index, ett_gsm_map_ms_AMBR); - - return offset; -} - - - -static int dissect_gsm_map_ms_PDN_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -10757,6 +11305,8 @@ static const ber_sequence_t gsm_map_ms_APN_Configuration_sequence[] = { { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ms_servedPartyIP_IPv6_Address, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Address }, { &hf_gsm_map_ms_apn_oi_Replacement, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN_OI_Replacement }, + { &hf_gsm_map_ms_sipto_Permission, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SIPTO_Permission }, + { &hf_gsm_map_ms_lipa_Permission, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LIPA_Permission }, { NULL, 0, 0, 0, NULL } }; @@ -10806,6 +11356,8 @@ static const ber_sequence_t gsm_map_ms_EPS_SubscriptionData_sequence[] = { { &hf_gsm_map_ms_apn_ConfigurationProfile, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN_ConfigurationProfile }, { &hf_gsm_map_ms_stn_sr , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_mps_CSPriority, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_mps_EPSPriority, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -10829,11 +11381,14 @@ dissect_gsm_map_ms_CSG_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs } +static const ber_sequence_t gsm_map_ms_LIPA_AllowedAPNList_sequence_of[1] = { + { &hf_gsm_map_ms_LIPA_AllowedAPNList_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_APN }, +}; static int -dissect_gsm_map_ms_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); +dissect_gsm_map_ms_LIPA_AllowedAPNList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_LIPA_AllowedAPNList_sequence_of, hf_index, ett_gsm_map_ms_LIPA_AllowedAPNList); return offset; } @@ -10841,8 +11396,9 @@ dissect_gsm_map_ms_Time(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static const ber_sequence_t gsm_map_ms_CSG_SubscriptionData_sequence[] = { { &hf_gsm_map_ms_csg_Id , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_CSG_Id }, - { &hf_gsm_map_ms_expirationDate, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_Time }, + { &hf_gsm_map_ms_expirationDate, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_Time }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_lipa_AllowedAPNList, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LIPA_AllowedAPNList }, { NULL, 0, 0, 0, NULL } }; @@ -10868,6 +11424,26 @@ dissect_gsm_map_ms_CSG_SubscriptionDataList(gboolean implicit_tag _U_, tvbuff_t } + +static int +dissect_gsm_map_ms_SubscribedPeriodicRAUTAUtimer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_ms_SubscribedPeriodicLAUtimer(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_InsertSubscriberDataArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_ms_msisdn , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, @@ -10903,6 +11479,10 @@ static const ber_sequence_t gsm_map_ms_InsertSubscriberDataArg_sequence[] = { { &hf_gsm_map_ms_ue_ReachabilityRequestIndicator, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_sgsn_Number, BER_CLASS_CON, 34, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_ms_mme_Name , BER_CLASS_CON, 35, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_DiameterIdentity }, + { &hf_gsm_map_ms_subscribedPeriodicRAUTAUtimer, BER_CLASS_CON, 36, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SubscribedPeriodicRAUTAUtimer }, + { &hf_gsm_map_ms_vplmnLIPAAllowed, BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_mdtUserConsent, BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_BOOLEAN }, + { &hf_gsm_map_ms_subscribedPeriodicLAUtimer, BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SubscribedPeriodicLAUtimer }, { NULL, 0, 0, 0, NULL } }; @@ -11384,6 +11964,7 @@ static const ber_sequence_t gsm_map_ms_RequestedInfo_sequence[] = { { &hf_gsm_map_ms_mnpRequestedInfo, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_t_adsData, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_requestedNodes, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RequestedNodes }, + { &hf_gsm_map_ms_servingNodeIndication, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -11444,34 +12025,15 @@ dissect_gsm_map_ms_GeodeticInformation(gboolean implicit_tag _U_, tvbuff_t *tvb } - -static int -dissect_gsm_map_ms_OCTET_STRING_SIZE_7(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - - - -static int -dissect_gsm_map_ms_OCTET_STRING_SIZE_5(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - - static const ber_sequence_t gsm_map_ms_LocationInformationEPS_sequence[] = { - { &hf_gsm_map_ms_e_utranCellGlobalIdentity, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OCTET_STRING_SIZE_7 }, - { &hf_gsm_map_ms_trackingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OCTET_STRING_SIZE_5 }, + { &hf_gsm_map_ms_e_utranCellGlobalIdentity, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_E_UTRAN_CGI }, + { &hf_gsm_map_ms_trackingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_TA_Id }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ms_geographicalInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GeographicalInformation }, { &hf_gsm_map_ms_geodeticInformation, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GeodeticInformation }, { &hf_gsm_map_ms_currentLocationRetrieved, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_ageOfLocationInformation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AgeOfLocationInformation }, + { &hf_gsm_map_ms_mme_Name , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_DiameterIdentity }, { NULL, 0, 0, 0, NULL } }; @@ -11581,32 +12143,9 @@ dissect_gsm_map_ms_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } - -int -dissect_gsm_map_ms_RAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 574 "../../asn1/gsm_map/gsm_map.cnf" - - tvbuff_t *parameter_tvb; - proto_tree *subtree; - - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - ¶meter_tvb); - - - if (!parameter_tvb) - return offset; - subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_RAIdentity); - de_gmm_rai(parameter_tvb, subtree, actx->pinfo, 0, 3, NULL,0); - - - - return offset; -} - - static const ber_sequence_t gsm_map_ms_LocationInformationGPRS_sequence[] = { { &hf_gsm_map_ms_cellGlobalIdOrServiceAreaIdOrLAI, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI }, - { &hf_gsm_map_ms_routeingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RAIdentity }, + { &hf_gsm_map_ms_routeingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_RAIdentity }, { &hf_gsm_map_ms_geographicalInformation, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GeographicalInformation }, { &hf_gsm_map_ms_sgsn_Number, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_ms_selectedLSAIdentity, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LSAIdentity }, @@ -11849,6 +12388,7 @@ dissect_gsm_map_ms_MNPInfoRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static const value_string gsm_map_ms_IMS_VoiceOverPS_SessionsInd_vals[] = { { 0, "imsVoiceOverPS-SessionsNotSupported" }, { 1, "imsVoiceOverPS-SessionsSupported" }, + { 2, "unknown" }, { 0, NULL } }; @@ -11873,7 +12413,7 @@ static const ber_sequence_t gsm_map_ms_SubscriberInfo_sequence[] = { { &hf_gsm_map_ms_gprs_MS_Class, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GPRSMSClass }, { &hf_gsm_map_ms_mnpInfoRes, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_MNPInfoRes }, { &hf_gsm_map_ms_imsVoiceOverPS_SessionsIndication, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_IMS_VoiceOverPS_SessionsInd }, - { &hf_gsm_map_ms_lastUE_ActivityTime, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Time }, + { &hf_gsm_map_ms_lastUE_ActivityTime, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Time }, { &hf_gsm_map_ms_lastRAT_Type, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Used_RAT_Type }, { &hf_gsm_map_ms_eps_SubscriberState, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_ms_PS_SubscriberState }, { &hf_gsm_map_ms_locationInformationEPS, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LocationInformationEPS }, @@ -11988,6 +12528,11 @@ static const ber_sequence_t gsm_map_ms_RequestedSubscriptionInfo_sequence[] = { { &hf_gsm_map_ms_additionalRequestedCAMEL_SubscriptionInfo, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AdditionalRequestedCAMEL_SubscriptionInfo }, { &hf_gsm_map_ms_msisdn_BS_List_01, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_csg_SubscriptionDataRequested, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_cw_Info , BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_clip_Info, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_clir_Info, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_hold_Info, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_ect_Info , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -12143,6 +12688,111 @@ dissect_gsm_map_ms_MSISDN_BS_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } +static const ber_sequence_t gsm_map_ms_Ext_CwFeature_sequence[] = { + { &hf_gsm_map_ms_basicService, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_BasicServiceCode }, + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_Ext_CwFeature(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_Ext_CwFeature_sequence, hf_index, ett_gsm_map_ms_Ext_CwFeature); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_Ext_CwFeatureList_sequence_of[1] = { + { &hf_gsm_map_ms_Ext_CwFeatureList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_Ext_CwFeature }, +}; + +static int +dissect_gsm_map_ms_Ext_CwFeatureList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_Ext_CwFeatureList_sequence_of, hf_index, ett_gsm_map_ms_Ext_CwFeatureList); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_CallWaitingData_sequence[] = { + { &hf_gsm_map_ms_cwFeatureList, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_CwFeatureList }, + { &hf_gsm_map_ms_notificationToCSE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_CallWaitingData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_CallWaitingData_sequence, hf_index, ett_gsm_map_ms_CallWaitingData); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_CallHoldData_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_notificationToCSE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_CallHoldData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_CallHoldData_sequence, hf_index, ett_gsm_map_ms_CallHoldData); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ClipData_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_overrideCategory, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_ss_OverrideCategory }, + { &hf_gsm_map_ms_notificationToCSE, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ClipData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ClipData_sequence, hf_index, ett_gsm_map_ms_ClipData); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ClirData_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_cliRestrictionOption, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ss_CliRestrictionOption }, + { &hf_gsm_map_ms_notificationToCSE, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ClirData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ClirData_sequence, hf_index, ett_gsm_map_ms_ClirData); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_EctData_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_notificationToCSE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_EctData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_EctData_sequence, hf_index, ett_gsm_map_ms_EctData); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_AnyTimeSubscriptionInterrogationRes_sequence[] = { { &hf_gsm_map_ms_callForwardingData, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallForwardingData }, { &hf_gsm_map_ms_callBarringData, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallBarringData }, @@ -12155,6 +12805,11 @@ static const ber_sequence_t gsm_map_ms_AnyTimeSubscriptionInterrogationRes_seque { &hf_gsm_map_ms_offeredCamel4CSIsInSGSN, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OfferedCamel4CSIs }, { &hf_gsm_map_ms_msisdn_BS_List, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_MSISDN_BS_List }, { &hf_gsm_map_ms_csg_SubscriptionDataList, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CSG_SubscriptionDataList }, + { &hf_gsm_map_ms_cw_Data , BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallWaitingData }, + { &hf_gsm_map_ms_ch_Data , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallHoldData }, + { &hf_gsm_map_ms_clip_Data, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ClipData }, + { &hf_gsm_map_ms_clir_Data, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ClirData }, + { &hf_gsm_map_ms_ect_data , BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EctData }, { NULL, 0, 0, 0, NULL } }; @@ -12273,15 +12928,15 @@ dissect_gsm_map_ms_ModificationRequestFor_IP_SM_GW_Data(gboolean implicit_tag _U } -static const asn_namedbit gsm_map_ms_ServingNode_bits[] = { - { 0, &hf_gsm_map_ms_ServingNode_mme, -1, -1, "mme", NULL }, +static const asn_namedbit gsm_map_ms_RequestedServingNode_bits[] = { + { 0, &hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn, -1, -1, "mmeAndSgsn", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; static int -dissect_gsm_map_ms_ServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_gsm_map_ms_RequestedServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_ServingNode_bits, hf_index, ett_gsm_map_ms_ServingNode, + gsm_map_ms_RequestedServingNode_bits, hf_index, ett_gsm_map_ms_RequestedServingNode, NULL); return offset; @@ -12303,6 +12958,89 @@ dissect_gsm_map_ms_ModificationRequestFor_CSG(gboolean implicit_tag _U_, tvbuff_ } +static const ber_sequence_t gsm_map_ms_ModificationRequestFor_CW_Info_sequence[] = { + { &hf_gsm_map_ms_basicService, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_BasicServiceCode }, + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_modifyNotificationToCSE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationInstruction }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ModificationRequestFor_CW_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ModificationRequestFor_CW_Info_sequence, hf_index, ett_gsm_map_ms_ModificationRequestFor_CW_Info); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ModificationRequestFor_CLIP_Info_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_overrideCategory, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ss_OverrideCategory }, + { &hf_gsm_map_ms_modifyNotificationToCSE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationInstruction }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ModificationRequestFor_CLIP_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ModificationRequestFor_CLIP_Info_sequence, hf_index, ett_gsm_map_ms_ModificationRequestFor_CLIP_Info); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ModificationRequestFor_CLIR_Info_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_cliRestrictionOption, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ss_CliRestrictionOption }, + { &hf_gsm_map_ms_modifyNotificationToCSE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationInstruction }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ModificationRequestFor_CLIR_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ModificationRequestFor_CLIR_Info_sequence, hf_index, ett_gsm_map_ms_ModificationRequestFor_CLIR_Info); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ModificationRequestFor_CH_Info_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_modifyNotificationToCSE, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationInstruction }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ModificationRequestFor_CH_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ModificationRequestFor_CH_Info_sequence, hf_index, ett_gsm_map_ms_ModificationRequestFor_CH_Info); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_ModificationRequestFor_ECT_Info_sequence[] = { + { &hf_gsm_map_ms_ss_Status, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Ext_SS_Status }, + { &hf_gsm_map_ms_modifyNotificationToCSE, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationInstruction }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_ModificationRequestFor_ECT_Info(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ModificationRequestFor_ECT_Info_sequence, hf_index, ett_gsm_map_ms_ModificationRequestFor_ECT_Info); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_AnyTimeModificationArg_sequence[] = { { &hf_gsm_map_ms_subscriberIdentity, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_SubscriberIdentity }, { &hf_gsm_map_ms_gsmSCF_Address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, @@ -12313,8 +13051,13 @@ static const ber_sequence_t gsm_map_ms_AnyTimeModificationArg_sequence[] = { { &hf_gsm_map_ms_longFTN_Supported, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_modificationRequestFor_ODB_data, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_ODB_data }, { &hf_gsm_map_ms_modificationRequestFor_IP_SM_GW_Data, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_IP_SM_GW_Data }, - { &hf_gsm_map_ms_activationRequestForUE_reachability, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ServingNode }, + { &hf_gsm_map_ms_activationRequestForUE_reachability, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RequestedServingNode }, { &hf_gsm_map_ms_modificationRequestFor_CSG, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_CSG }, + { &hf_gsm_map_ms_modificationRequestFor_CW_Data, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_CW_Info }, + { &hf_gsm_map_ms_modificationRequestFor_CLIP_Data, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_CLIP_Info }, + { &hf_gsm_map_ms_modificationRequestFor_CLIR_Data, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_CLIR_Info }, + { &hf_gsm_map_ms_modificationRequestFor_HOLD_Data, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_CH_Info }, + { &hf_gsm_map_ms_modificationRequestFor_ECT_Data, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_ECT_Info }, { NULL, 0, 0, 0, NULL } }; @@ -12327,6 +13070,22 @@ dissect_gsm_map_ms_AnyTimeModificationArg(gboolean implicit_tag _U_, tvbuff_t *t } +static const asn_namedbit gsm_map_ms_ServingNode_bits[] = { + { 0, &hf_gsm_map_ms_ServingNode_mme, -1, -1, "mme", NULL }, + { 1, &hf_gsm_map_ms_ServingNode_sgsn, -1, -1, "sgsn", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_ms_ServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ServingNode_bits, hf_index, ett_gsm_map_ms_ServingNode, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_Ext_ForwardingInfoFor_CSE_sequence[] = { { &hf_gsm_map_ms_ss_Code , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_SS_Code }, { &hf_gsm_map_ms_forwardingFeatureList, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_ForwFeatureList }, @@ -12390,6 +13149,12 @@ static const ber_sequence_t gsm_map_ms_AnyTimeModificationRes_sequence[] = { { &hf_gsm_map_ms_camel_SubscriptionInfo, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CAMEL_SubscriptionInfo }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ms_odb_Info , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ODB_Info }, + { &hf_gsm_map_ms_cw_Data , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallWaitingData }, + { &hf_gsm_map_ms_ch_Data , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallHoldData }, + { &hf_gsm_map_ms_clip_Data, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ClipData }, + { &hf_gsm_map_ms_clir_Data, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ClirData }, + { &hf_gsm_map_ms_ect_data , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EctData }, + { &hf_gsm_map_ms_serviceCentreAddress, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString }, { NULL, 0, 0, 0, NULL } }; @@ -12413,6 +13178,11 @@ static const ber_sequence_t gsm_map_ms_NoteSubscriberDataModifiedArg_sequence[] { &hf_gsm_map_ms_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ms_ue_reachable, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ServingNode }, { &hf_gsm_map_ms_csg_SubscriptionDataList, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CSG_SubscriptionDataList }, + { &hf_gsm_map_ms_cw_Data , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallWaitingData }, + { &hf_gsm_map_ms_ch_Data , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CallHoldData }, + { &hf_gsm_map_ms_clip_Data, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ClipData }, + { &hf_gsm_map_ms_clir_Data, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ClirData }, + { &hf_gsm_map_ms_ect_data , BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EctData }, { NULL, 0, 0, 0, NULL } }; @@ -12891,6 +13661,8 @@ static const ber_sequence_t gsm_map_ch_ProvideRoamingNumberArg_sequence[] = { { &hf_gsm_map_ch_mtRoamingRetrySupported, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ch_NULL }, { &hf_gsm_map_ch_pagingArea, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PagingArea }, { &hf_gsm_map_ch_callPriority, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_EMLPP_Priority }, + { &hf_gsm_map_ch_mtrf_Indicator, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ch_NULL }, + { &hf_gsm_map_ch_oldMSC_Number, BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { NULL, 0, 0, 0, NULL } }; @@ -12907,6 +13679,7 @@ static const ber_sequence_t gsm_map_ch_ProvideRoamingNumberRes_sequence[] = { { &hf_gsm_map_ch_roamingNumber, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_ch_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ch_releaseResourcesSupported, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ch_NULL }, + { &hf_gsm_map_ch_vmsc_Address, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, { NULL, 0, 0, 0, NULL } }; @@ -14922,7 +15695,6 @@ static const value_string gsm_old_GSMMAPOperationLocalvalue_vals[] = { { 106, "unAllocated" }, { 107, "unAllocated" }, { 108, "unAllocated" }, - { 109, "unAllocated" }, { 109, "lcs-PeriodicLocationCancellation" }, { 110, "lcs-LocationUpdate" }, { 111, "lcs-PeriodicLocationRequest" }, @@ -19514,6 +20286,10 @@ void proto_register_gsm_map(void) { { "sm-deliveryNotIntended", "gsm_map.sm.sm_deliveryNotIntended", FT_UINT32, BASE_DEC, VALS(gsm_map_sm_SM_DeliveryNotIntended_vals), 0, NULL, HFILL }}, + { &hf_gsm_map_sm_ip_sm_gwGuidanceIndicator, + { "ip-sm-gwGuidanceIndicator", "gsm_map.sm.ip_sm_gwGuidanceIndicator", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_sm_imsi, { "imsi", "gsm_map.sm.imsi", FT_BYTES, BASE_NONE, NULL, 0, @@ -19522,10 +20298,18 @@ void proto_register_gsm_map(void) { { "locationInfoWithLMSI", "gsm_map.sm.locationInfoWithLMSI", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_gsm_map_sm_mwd_Set, - { "mwd-Set", "gsm_map.sm.mwd_Set", - FT_BOOLEAN, BASE_NONE, NULL, 0, - "BOOLEAN", HFILL }}, + { &hf_gsm_map_sm_ip_sm_gwGuidance, + { "ip-sm-gwGuidance", "gsm_map.sm.ip_sm_gwGuidance", + FT_NONE, BASE_NONE, NULL, 0, + "IP_SM_GW_Guidance", HFILL }}, + { &hf_gsm_map_sm_minimumDeliveryTimeValue, + { "minimumDeliveryTimeValue", "gsm_map.sm.minimumDeliveryTimeValue", + FT_UINT32, BASE_DEC, NULL, 0, + "SM_DeliveryTimerValue", HFILL }}, + { &hf_gsm_map_sm_recommendedDeliveryTimeValue, + { "recommendedDeliveryTimeValue", "gsm_map.sm.recommendedDeliveryTimeValue", + FT_UINT32, BASE_DEC, NULL, 0, + "SM_DeliveryTimerValue", HFILL }}, { &hf_gsm_map_sm_networkNode_Number, { "networkNode-Number", "gsm_map.sm.networkNode_Number", FT_BYTES, BASE_NONE, NULL, 0, @@ -19566,6 +20350,14 @@ void proto_register_gsm_map(void) { { "moreMessagesToSend", "gsm_map.sm.moreMessagesToSend", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_sm_smDeliveryTimer, + { "smDeliveryTimer", "gsm_map.sm.smDeliveryTimer", + FT_UINT32, BASE_DEC, NULL, 0, + "SM_DeliveryTimerValue", HFILL }}, + { &hf_gsm_map_sm_smDeliveryStartTime, + { "smDeliveryStartTime", "gsm_map.sm.smDeliveryStartTime", + FT_BYTES, BASE_NONE, NULL, 0, + "Time", HFILL }}, { &hf_gsm_map_sm_serviceCentreAddressDA, { "serviceCentreAddressDA", "gsm_map.sm.serviceCentreAddressDA", FT_BYTES, BASE_NONE, NULL, 0, @@ -19717,6 +20509,90 @@ void proto_register_gsm_map(void) { { "traceCollectionEntity", "gsm_map.om.traceCollectionEntity", FT_BYTES, BASE_NONE, NULL, 0, "GSN_Address", HFILL }}, + { &hf_gsm_map_om_mdt_Configuration, + { "mdt-Configuration", "gsm_map.om.mdt_Configuration", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_jobType, + { "jobType", "gsm_map.om.jobType", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_JobType_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_om_areaScope, + { "areaScope", "gsm_map.om.areaScope", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_listOfMeasurements, + { "listOfMeasurements", "gsm_map.om.listOfMeasurements", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_reportingTrigger, + { "reportingTrigger", "gsm_map.om.reportingTrigger", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_reportInterval, + { "reportInterval", "gsm_map.om.reportInterval", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_ReportInterval_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_om_reportAmount, + { "reportAmount", "gsm_map.om.reportAmount", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_ReportAmount_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_om_eventThresholdRSRP, + { "eventThresholdRSRP", "gsm_map.om.eventThresholdRSRP", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_eventThresholdRSRQ, + { "eventThresholdRSRQ", "gsm_map.om.eventThresholdRSRQ", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_loggingInterval, + { "loggingInterval", "gsm_map.om.loggingInterval", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_LoggingInterval_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_om_loggingDuration, + { "loggingDuration", "gsm_map.om.loggingDuration", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_LoggingDuration_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_om_cgi_List, + { "cgi-List", "gsm_map.om.cgi_List", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_e_utran_cgi_List, + { "e-utran-cgi-List", "gsm_map.om.e_utran_cgi_List", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_routingAreaId_List, + { "routingAreaId-List", "gsm_map.om.routingAreaId_List", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_locationAreaId_List, + { "locationAreaId-List", "gsm_map.om.locationAreaId_List", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_trackingAreaId_List, + { "trackingAreaId-List", "gsm_map.om.trackingAreaId_List", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_CGI_List_item, + { "GlobalCellId", "gsm_map.om.GlobalCellId", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_E_UTRAN_CGI_List_item, + { "E-UTRAN-CGI", "gsm_map.om.E_UTRAN_CGI", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_RoutingAreaId_List_item, + { "RAIdentity", "gsm_map.om.RAIdentity", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_LocationAreaId_List_item, + { "LAIFixedLength", "gsm_map.om.LAIFixedLength", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_om_TrackingAreaId_List_item, + { "TA-Id", "gsm_map.om.TA_Id", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_om_msc_s_TraceDepth, { "msc-s-TraceDepth", "gsm_map.om.msc_s_TraceDepth", FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, @@ -20300,6 +21176,10 @@ void proto_register_gsm_map(void) { { "longGroupID-Supported", "gsm_map.ms.longGroupID_Supported", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_mtRoamingForwardingSupported, + { "mtRoamingForwardingSupported", "gsm_map.ms.mtRoamingForwardingSupported", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_sendSubscriberData, { "sendSubscriberData", "gsm_map.ms.sendSubscriberData", FT_NONE, BASE_NONE, NULL, 0, @@ -20348,6 +21228,26 @@ void proto_register_gsm_map(void) { { "typeOfUpdate", "gsm_map.ms.typeOfUpdate", FT_UINT32, BASE_DEC, VALS(gsm_map_ms_TypeOfUpdate_vals), 0, NULL, HFILL }}, + { &hf_gsm_map_ms_mtrf_SupportedAndAuthorized, + { "mtrf-SupportedAndAuthorized", "gsm_map.ms.mtrf_SupportedAndAuthorized", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_mtrf_SupportedAndNotAuthorized, + { "mtrf-SupportedAndNotAuthorized", "gsm_map.ms.mtrf_SupportedAndNotAuthorized", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_newMSC_Number, + { "newMSC-Number", "gsm_map.ms.newMSC_Number", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_ms_newVLR_Number, + { "newVLR-Number", "gsm_map.ms.newVLR_Number", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_ms_new_lmsi, + { "new-lmsi", "gsm_map.ms.new_lmsi", + FT_BYTES, BASE_NONE, NULL, 0, + "LMSI", HFILL }}, { &hf_gsm_map_ms_sgsn_Number, { "sgsn-Number", "gsm_map.ms.sgsn_Number", FT_BYTES, BASE_NONE, NULL, 0, @@ -20508,6 +21408,10 @@ void proto_register_gsm_map(void) { { "epsSubscriptionDataNotNeeded", "gsm_map.ms.epsSubscriptionDataNotNeeded", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_ue_srvcc_Capability, + { "ue-srvcc-Capability", "gsm_map.ms.ue_srvcc_Capability", + FT_UINT32, BASE_DEC, VALS(gsm_map_ms_UE_SRVCC_Capability_vals), 0, + NULL, HFILL }}, { &hf_gsm_map_ms_pdn_gw_update, { "pdn-gw-update", "gsm_map.ms.pdn_gw_update", FT_NONE, BASE_NONE, NULL, 0, @@ -20672,6 +21576,18 @@ void proto_register_gsm_map(void) { { "uesbi-Iu", "gsm_map.ms.uesbi_Iu", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_regionalSubscriptionData, + { "regionalSubscriptionData", "gsm_map.ms.regionalSubscriptionData", + FT_UINT32, BASE_DEC, NULL, 0, + "ZoneCodeList", HFILL }}, + { &hf_gsm_map_ms_globalCallReference, + { "globalCallReference", "gsm_map.ms.globalCallReference", + FT_BYTES, BASE_NONE, NULL, 0, + "LCLS_GlobalCallReference", HFILL }}, + { &hf_gsm_map_ms_lcls_Negotiation, + { "lcls-Negotiation", "gsm_map.ms.lcls_Negotiation", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_BSSMAP_ServiceHandoverList_item, { "BSSMAP-ServiceHandoverInfo", "gsm_map.ms.BSSMAP_ServiceHandoverInfo", FT_NONE, BASE_NONE, NULL, 0, @@ -20896,6 +21812,14 @@ void proto_register_gsm_map(void) { { "expirationDate", "gsm_map.ms.expirationDate", FT_BYTES, BASE_NONE, NULL, 0, "Time", HFILL }}, + { &hf_gsm_map_ms_lipa_AllowedAPNList, + { "lipa-AllowedAPNList", "gsm_map.ms.lipa_AllowedAPNList", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_LIPA_AllowedAPNList_item, + { "APN", "gsm_map.ms.APN", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_apn_oi_Replacement, { "apn-oi-Replacement", "gsm_map.ms.apn_oi_Replacement", FT_BYTES, BASE_NONE, NULL, 0, @@ -20916,6 +21840,14 @@ void proto_register_gsm_map(void) { { "stn-sr", "gsm_map.ms.stn_sr", FT_BYTES, BASE_NONE, NULL, 0, "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_ms_mps_CSPriority, + { "mps-CSPriority", "gsm_map.ms.mps_CSPriority", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_mps_EPSPriority, + { "mps-EPSPriority", "gsm_map.ms.mps_EPSPriority", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_defaultContext, { "defaultContext", "gsm_map.ms.defaultContext", FT_UINT32, BASE_DEC, NULL, 0, @@ -20964,6 +21896,14 @@ void proto_register_gsm_map(void) { { "servedPartyIP-IPv6-Address", "gsm_map.ms.servedPartyIP_IPv6_Address", FT_BYTES, BASE_NONE, NULL, 0, "PDP_Address", HFILL }}, + { &hf_gsm_map_ms_sipto_Permission, + { "sipto-Permission", "gsm_map.ms.sipto_Permission", + FT_UINT32, BASE_DEC, VALS(gsm_map_ms_SIPTO_Permission_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_lipa_Permission, + { "lipa-Permission", "gsm_map.ms.lipa_Permission", + FT_UINT32, BASE_DEC, VALS(gsm_map_ms_LIPA_Permission_vals), 0, + NULL, HFILL }}, { &hf_gsm_map_ms_qos_Class_Identifier, { "qos-Class-Identifier", "gsm_map.ms.qos_Class_Identifier", FT_UINT32, BASE_DEC, NULL, 0, @@ -21192,10 +22132,6 @@ void proto_register_gsm_map(void) { { "roamingRestrictionDueToUnsupportedFeature", "gsm_map.ms.roamingRestrictionDueToUnsupportedFeature", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_gsm_map_ms_regionalSubscriptionData, - { "regionalSubscriptionData", "gsm_map.ms.regionalSubscriptionData", - FT_UINT32, BASE_DEC, NULL, 0, - "ZoneCodeList", HFILL }}, { &hf_gsm_map_ms_vbsSubscriptionData, { "vbsSubscriptionData", "gsm_map.ms.vbsSubscriptionData", FT_UINT32, BASE_DEC, NULL, 0, @@ -21860,6 +22796,10 @@ void proto_register_gsm_map(void) { { "requestedNodes", "gsm_map.ms.requestedNodes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_servingNodeIndication, + { "servingNodeIndication", "gsm_map.ms.servingNodeIndication", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_ageOfLocationInformation, { "ageOfLocationInformation", "gsm_map.ms.ageOfLocationInformation", FT_UINT32, BASE_DEC, NULL, 0, @@ -21903,11 +22843,15 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ms_e_utranCellGlobalIdentity, { "e-utranCellGlobalIdentity", "gsm_map.ms.e_utranCellGlobalIdentity", FT_BYTES, BASE_NONE, NULL, 0, - "OCTET_STRING_SIZE_7", HFILL }}, + "E_UTRAN_CGI", HFILL }}, { &hf_gsm_map_ms_trackingAreaIdentity, { "trackingAreaIdentity", "gsm_map.ms.trackingAreaIdentity", FT_BYTES, BASE_NONE, NULL, 0, - "OCTET_STRING_SIZE_5", HFILL }}, + "TA_Id", HFILL }}, + { &hf_gsm_map_ms_mme_Name, + { "mme-Name", "gsm_map.ms.mme_Name", + FT_BYTES, BASE_NONE, NULL, 0, + "DiameterIdentity", HFILL }}, { &hf_gsm_map_ms_routeingAreaIdentity, { "routeingAreaIdentity", "gsm_map.ms.routeingAreaIdentity", FT_BYTES, BASE_NONE, NULL, 0, @@ -22104,6 +23048,42 @@ void proto_register_gsm_map(void) { { "csg-SubscriptionDataList", "gsm_map.ms.csg_SubscriptionDataList", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_cw_Data, + { "cw-Data", "gsm_map.ms.cw_Data", + FT_NONE, BASE_NONE, NULL, 0, + "CallWaitingData", HFILL }}, + { &hf_gsm_map_ms_ch_Data, + { "ch-Data", "gsm_map.ms.ch_Data", + FT_NONE, BASE_NONE, NULL, 0, + "CallHoldData", HFILL }}, + { &hf_gsm_map_ms_clip_Data, + { "clip-Data", "gsm_map.ms.clip_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ClipData", HFILL }}, + { &hf_gsm_map_ms_clir_Data, + { "clir-Data", "gsm_map.ms.clir_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ClirData", HFILL }}, + { &hf_gsm_map_ms_ect_data, + { "ect-data", "gsm_map.ms.ect_data", + FT_NONE, BASE_NONE, NULL, 0, + "EctData", HFILL }}, + { &hf_gsm_map_ms_cwFeatureList, + { "cwFeatureList", "gsm_map.ms.cwFeatureList", + FT_UINT32, BASE_DEC, NULL, 0, + "Ext_CwFeatureList", HFILL }}, + { &hf_gsm_map_ms_Ext_CwFeatureList_item, + { "Ext-CwFeature", "gsm_map.ms.Ext_CwFeature", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_overrideCategory, + { "overrideCategory", "gsm_map.ms.overrideCategory", + FT_UINT32, BASE_DEC, VALS(gsm_map_ss_OverrideCategory_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_cliRestrictionOption, + { "cliRestrictionOption", "gsm_map.ms.cliRestrictionOption", + FT_UINT32, BASE_DEC, VALS(gsm_map_ss_CliRestrictionOption_vals), 0, + NULL, HFILL }}, { &hf_gsm_map_ms_requestedSS_Info, { "requestedSS-Info", "gsm_map.ms.requestedSS_Info", FT_NONE, BASE_NONE, NULL, 0, @@ -22136,6 +23116,26 @@ void proto_register_gsm_map(void) { { "csg-SubscriptionDataRequested", "gsm_map.ms.csg_SubscriptionDataRequested", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_cw_Info, + { "cw-Info", "gsm_map.ms.cw_Info", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_clip_Info, + { "clip-Info", "gsm_map.ms.clip_Info", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_clir_Info, + { "clir-Info", "gsm_map.ms.clir_Info", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_hold_Info, + { "hold-Info", "gsm_map.ms.hold_Info", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_ect_Info, + { "ect-Info", "gsm_map.ms.ect_Info", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_MSISDN_BS_List_item, { "MSISDN-BS", "gsm_map.ms.MSISDN_BS", FT_NONE, BASE_NONE, NULL, 0, @@ -22207,11 +23207,31 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ms_activationRequestForUE_reachability, { "activationRequestForUE-reachability", "gsm_map.ms.activationRequestForUE_reachability", FT_BYTES, BASE_NONE, NULL, 0, - "ServingNode", HFILL }}, + "RequestedServingNode", HFILL }}, { &hf_gsm_map_ms_modificationRequestFor_CSG, { "modificationRequestFor-CSG", "gsm_map.ms.modificationRequestFor_CSG", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_modificationRequestFor_CW_Data, + { "modificationRequestFor-CW-Data", "gsm_map.ms.modificationRequestFor_CW_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ModificationRequestFor_CW_Info", HFILL }}, + { &hf_gsm_map_ms_modificationRequestFor_CLIP_Data, + { "modificationRequestFor-CLIP-Data", "gsm_map.ms.modificationRequestFor_CLIP_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ModificationRequestFor_CLIP_Info", HFILL }}, + { &hf_gsm_map_ms_modificationRequestFor_CLIR_Data, + { "modificationRequestFor-CLIR-Data", "gsm_map.ms.modificationRequestFor_CLIR_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ModificationRequestFor_CLIR_Info", HFILL }}, + { &hf_gsm_map_ms_modificationRequestFor_HOLD_Data, + { "modificationRequestFor-HOLD-Data", "gsm_map.ms.modificationRequestFor_HOLD_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ModificationRequestFor_CH_Info", HFILL }}, + { &hf_gsm_map_ms_modificationRequestFor_ECT_Data, + { "modificationRequestFor-ECT-Data", "gsm_map.ms.modificationRequestFor_ECT_Data", + FT_NONE, BASE_NONE, NULL, 0, + "ModificationRequestFor_ECT_Info", HFILL }}, { &hf_gsm_map_ms_modifyNotificationToCSE, { "modifyNotificationToCSE", "gsm_map.ms.modifyNotificationToCSE", FT_UINT32, BASE_DEC, VALS(gsm_map_ms_ModificationInstruction_vals), 0, @@ -22220,6 +23240,10 @@ void proto_register_gsm_map(void) { { "ss-InfoFor-CSE", "gsm_map.ms.ss_InfoFor_CSE", FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Ext_SS_InfoFor_CSE_vals), 0, "Ext_SS_InfoFor_CSE", HFILL }}, + { &hf_gsm_map_ms_serviceCentreAddress, + { "serviceCentreAddress", "gsm_map.ms.serviceCentreAddress", + FT_BYTES, BASE_NONE, NULL, 0, + "AddressString", HFILL }}, { &hf_gsm_map_ms_forwardedToNumber_01, { "forwardedToNumber", "gsm_map.ms.forwardedToNumber", FT_BYTES, BASE_NONE, NULL, 0, @@ -22332,10 +23356,22 @@ void proto_register_gsm_map(void) { { "ue-ReachabilityRequestIndicator", "gsm_map.ms.ue_ReachabilityRequestIndicator", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_gsm_map_ms_mme_Name, - { "mme-Name", "gsm_map.ms.mme_Name", - FT_BYTES, BASE_NONE, NULL, 0, - "DiameterIdentity", HFILL }}, + { &hf_gsm_map_ms_subscribedPeriodicRAUTAUtimer, + { "subscribedPeriodicRAUTAUtimer", "gsm_map.ms.subscribedPeriodicRAUTAUtimer", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_vplmnLIPAAllowed, + { "vplmnLIPAAllowed", "gsm_map.ms.vplmnLIPAAllowed", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_mdtUserConsent, + { "mdtUserConsent", "gsm_map.ms.mdtUserConsent", + FT_BOOLEAN, BASE_NONE, NULL, 0, + "BOOLEAN", HFILL }}, + { &hf_gsm_map_ms_subscribedPeriodicLAUtimer, + { "subscribedPeriodicLAUtimer", "gsm_map.ms.subscribedPeriodicLAUtimer", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_SupportedRAT_Types_utran, { "utran", "gsm_map.ms.utran", FT_BOOLEAN, 8, NULL, 0x80, @@ -22492,6 +23528,26 @@ void proto_register_gsm_map(void) { { "boicExHC", "gsm_map.ms.boicExHC", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator, + { "permission-indicator", "gsm_map.ms.permission-indicator", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_ms_LCLS_Negotiation_forward_data_sending_indicator, + { "forward-data-sending-indicator", "gsm_map.ms.forward-data-sending-indicator", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_ms_LCLS_Negotiation_backward_sending_indicator, + { "backward-sending-indicator", "gsm_map.ms.backward-sending-indicator", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_ms_LCLS_Negotiation_forward_data_reception_indicator, + { "forward-data-reception-indicator", "gsm_map.ms.forward-data-reception-indicator", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_ms_LCLS_Negotiation_backward_data_reception_indicator, + { "backward-data-reception-indicator", "gsm_map.ms.backward-data-reception-indicator", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, { &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus, { "equipmentStatus", "gsm_map.ms.equipmentStatus", FT_BOOLEAN, 8, NULL, 0x80, @@ -22856,10 +23912,18 @@ void proto_register_gsm_map(void) { { "sgsn", "gsm_map.ms.sgsn", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, + { &hf_gsm_map_ms_RequestedServingNode_mmeAndSgsn, + { "mmeAndSgsn", "gsm_map.ms.mmeAndSgsn", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_gsm_map_ms_ServingNode_mme, { "mme", "gsm_map.ms.mme", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_gsm_map_ms_ServingNode_sgsn, + { "sgsn", "gsm_map.ms.sgsn", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, /* --- Module MAP-CH-DataTypes --- --- --- */ @@ -23135,6 +24199,14 @@ void proto_register_gsm_map(void) { { "pagingArea", "gsm_map.ch.pagingArea", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ch_mtrf_Indicator, + { "mtrf-Indicator", "gsm_map.ch.mtrf_Indicator", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ch_oldMSC_Number, + { "oldMSC-Number", "gsm_map.ch.oldMSC_Number", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, { &hf_gsm_map_ch_o_CSI, { "o-CSI", "gsm_map.ch.o_CSI", FT_NONE, BASE_NONE, NULL, 0, @@ -24721,6 +25793,7 @@ void proto_register_gsm_map(void) { &ett_gsm_map_sm_RoutingInfoForSM_Arg, &ett_gsm_map_sm_RoutingInfoForSM_Res, + &ett_gsm_map_sm_IP_SM_GW_Guidance, &ett_gsm_map_sm_LocationInfoWithLMSI, &ett_gsm_map_sm_Additional_Number, &ett_gsm_map_sm_MO_ForwardSM_Arg, @@ -24743,6 +25816,13 @@ void proto_register_gsm_map(void) { /* --- Module MAP-OM-DataTypes --- --- --- */ &ett_gsm_map_om_ActivateTraceModeArg, + &ett_gsm_map_om_MDT_Configuration, + &ett_gsm_map_om_AreaScope, + &ett_gsm_map_om_CGI_List, + &ett_gsm_map_om_E_UTRAN_CGI_List, + &ett_gsm_map_om_RoutingAreaId_List, + &ett_gsm_map_om_LocationAreaId_List, + &ett_gsm_map_om_TrackingAreaId_List, &ett_gsm_map_om_TraceDepthList, &ett_gsm_map_om_TraceNE_TypeList, &ett_gsm_map_om_TraceInterfaceList, @@ -24807,6 +25887,7 @@ void proto_register_gsm_map(void) { &ett_gsm_map_ms_ForwardAccessSignalling_Arg_U, &ett_gsm_map_ms_AllowedUMTS_Algorithms, &ett_gsm_map_ms_PrepareHO_Arg_U, + &ett_gsm_map_ms_LCLS_Negotiation, &ett_gsm_map_ms_BSSMAP_ServiceHandoverList, &ett_gsm_map_ms_BSSMAP_ServiceHandoverInfo, &ett_gsm_map_ms_RadioResourceList, @@ -24836,6 +25917,7 @@ void proto_register_gsm_map(void) { &ett_gsm_map_ms_InsertSubscriberDataArg, &ett_gsm_map_ms_CSG_SubscriptionDataList, &ett_gsm_map_ms_CSG_SubscriptionData, + &ett_gsm_map_ms_LIPA_AllowedAPNList, &ett_gsm_map_ms_EPS_SubscriptionData, &ett_gsm_map_ms_APN_ConfigurationProfile, &ett_gsm_map_ms_EPS_DataList, @@ -24969,6 +26051,13 @@ void proto_register_gsm_map(void) { &ett_gsm_map_ms_AnyTimeInterrogationRes, &ett_gsm_map_ms_AnyTimeSubscriptionInterrogationArg, &ett_gsm_map_ms_AnyTimeSubscriptionInterrogationRes, + &ett_gsm_map_ms_CallWaitingData, + &ett_gsm_map_ms_Ext_CwFeatureList, + &ett_gsm_map_ms_Ext_CwFeature, + &ett_gsm_map_ms_ClipData, + &ett_gsm_map_ms_ClirData, + &ett_gsm_map_ms_CallHoldData, + &ett_gsm_map_ms_EctData, &ett_gsm_map_ms_RequestedSubscriptionInfo, &ett_gsm_map_ms_MSISDN_BS_List, &ett_gsm_map_ms_MSISDN_BS, @@ -24977,7 +26066,13 @@ void proto_register_gsm_map(void) { &ett_gsm_map_ms_ODB_Info, &ett_gsm_map_ms_CAMEL_SubscriptionInfo, &ett_gsm_map_ms_AnyTimeModificationArg, + &ett_gsm_map_ms_ModificationRequestFor_CW_Info, + &ett_gsm_map_ms_ModificationRequestFor_CH_Info, + &ett_gsm_map_ms_ModificationRequestFor_ECT_Info, + &ett_gsm_map_ms_ModificationRequestFor_CLIR_Info, + &ett_gsm_map_ms_ModificationRequestFor_CLIP_Info, &ett_gsm_map_ms_ModificationRequestFor_CSG, + &ett_gsm_map_ms_RequestedServingNode, &ett_gsm_map_ms_ServingNode, &ett_gsm_map_ms_AnyTimeModificationRes, &ett_gsm_map_ms_ModificationRequestFor_CF_Info, diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index acf449806f..89fae1a478 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-gsm_map.h */ -/* ../../tools/asn2wrs.py -b -e -c ./gsm_map.cnf -s ./packet-gsm_map-template -D . ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ +/* ../../tools/asn2wrs.py -b -e -c ./gsm_map.cnf -s ./packet-gsm_map-template -D . -O ../../epan/dissectors ../ros/Remote-Operations-Information-Objects.asn MobileDomainDefinitions.asn MAP-ApplicationContexts.asn MAP-SS-Code.asn MAP-BS-Code.asn MAP-TS-Code.asn MAP-ExtensionDataTypes.asn MAP-CommonDataTypes.asn MAP-SS-DataTypes.asn MAP-ER-DataTypes.asn MAP-SM-DataTypes.asn MAP-OM-DataTypes.asn MAP-MS-DataTypes.asn MAP-CH-DataTypes.asn MAP-LCS-DataTypes.asn MAP-GR-DataTypes.asn MAP-DialogueInformation.asn MAP-LocationServiceOperations.asn MAP-Group-Call-Operations.asn MAP-ShortMessageServiceOperations.asn MAP-SupplementaryServiceOperations.asn MAP-CallHandlingOperations.asn MAP-OperationAndMaintenanceOperations.asn MAP-MobileServiceOperations.asn MAP-Errors.asn MAP-Protocol.asn GSMMAP.asn SS-DataTypes.asn SS-Operations.asn */ /* Input file: packet-gsm_map-template.h */ @@ -109,6 +109,7 @@ int dissect_gsm_map_NetworkResource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ int dissect_gsm_map_LCSClientExternalID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_LCSClientInternalID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_LCSServiceTypeID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_gsm_map_RAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_CellGlobalIdOrServiceAreaIdFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_LAIFixedLength(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_BasicServiceCode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -180,7 +181,6 @@ int dissect_gsm_map_ms_DefaultSMS_Handling(gboolean implicit_tag _U_, tvbuff_t * int dissect_gsm_map_ms_MS_Classmark2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_GPRSMSClass(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_LocationInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); -int dissect_gsm_map_ms_RAIdentity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_GeographicalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_SubscriberState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_GPRSChargingID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); |