Update to V9.1.0 (2010-03).
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 19 Apr 2010 05:58:01 +0000 (05:58 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 19 Apr 2010 05:58:01 +0000 (05:58 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32509 f5534014-38df-0310-8fa8-9805f1628bb7

27 files changed:
asn1/gsm_map/MAP-ApplicationContexts.asn
asn1/gsm_map/MAP-BS-Code.asn
asn1/gsm_map/MAP-CH-DataTypes.asn
asn1/gsm_map/MAP-CallHandlingOperations.asn
asn1/gsm_map/MAP-CommonDataTypes.asn
asn1/gsm_map/MAP-DialogueInformation.asn
asn1/gsm_map/MAP-Errors.asn
asn1/gsm_map/MAP-ExtensionDataTypes.asn
asn1/gsm_map/MAP-GR-DataTypes.asn
asn1/gsm_map/MAP-Group-Call-Operations.asn
asn1/gsm_map/MAP-LCS-DataTypes.asn
asn1/gsm_map/MAP-LocationServiceOperations.asn
asn1/gsm_map/MAP-MS-DataTypes.asn
asn1/gsm_map/MAP-MobileServiceOperations.asn
asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn
asn1/gsm_map/MAP-Protocol.asn
asn1/gsm_map/MAP-SM-DataTypes.asn
asn1/gsm_map/MAP-SS-Code.asn
asn1/gsm_map/MAP-SS-DataTypes.asn
asn1/gsm_map/MAP-ShortMessageServiceOperations.asn
asn1/gsm_map/MAP-SupplementaryServiceOperations.asn
asn1/gsm_map/MAP-TS-Code.asn
asn1/gsm_map/SS-DataTypes.asn
asn1/gsm_map/SS-Errors.asn
asn1/gsm_map/SS-Operations.asn
asn1/gsm_map/SS-Protocol.asn
epan/dissectors/packet-gsm_map.c

index dc0aa8d77258b6106c1d622cc692bae7455849ce..b5ffe2ce01964862d64dedfa56a09e37300bca53 100644 (file)
@@ -1,7 +1,7 @@
 -- $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.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 MAP-ApplicationContexts {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-ApplicationContexts (2) version11 (11)}
@@ -194,5 +194,3 @@ resourceManagementContext-v3  OBJECT IDENTIFIER ::=
 
 
 END
-
-
index e589c4e344fe1a262d0400f6828fad5ebe292b1e..edaa910126d0df1790d20f16cfc48603f5359987 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12
+-- 3GPP TS 29.002 V9.1.0 (2010-03
 -- 17.7.10     Bearer Service Codes
  
 MAP-BS-Code {
@@ -128,4 +128,3 @@ plmn-specificBS-E   BearerServiceCode ::= '11011110'B
 plmn-specificBS-F      BearerServiceCode ::= '11011111'B
 
 END
-
index e5e0db426c7a728bc659f150a057e7288c51bec8..1c39c6c5f3e6a093f1dc1588aab032ee52969545 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 -- 17.7.3      Call handling data types
  
 MAP-CH-DataTypes {
@@ -191,7 +191,8 @@ SendRoutingInfoRes ::= [3] SEQUENCE {
        allowedServices [20] AllowedServices    OPTIONAL,
        unavailabilityCause     [21] UnavailabilityCause        OPTIONAL,
        releaseResourcesSupported       [22] NULL               OPTIONAL,
-       gsm-BearerCapability    [23] ExternalSignalInfo OPTIONAL
+       gsm-BearerCapability    [23] ExternalSignalInfo OPTIONAL,
+       mtRoamingRetryIndicator [24] NULL               OPTIONAL
        }
 
 AllowedServices ::= BIT STRING {
index 91c982af0a88cbf4ac5f9363bee7013516b6197b..b09459b98335e74d247ce5a976ae205f8a701d5f 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12
+-- 3GPP TS 29.002 V9.1.0 (2010-03
 --17.6.3       Call Handling Operations
 MAP-CallHandlingOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
index a964c9c30a586d87a2096eff003385fc29472819..4e98254e1900ff873dbe710548802f33726899d7 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 -- 17.7.8      Common data types
 
 MAP-CommonDataTypes {
@@ -67,11 +67,11 @@ AccessNetworkSignalInfo,
        LCSClientExternalID,
        LCSClientInternalID,
        LCSServiceTypeID,
--- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
+
+       -- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
        ProtocolId,
        -- gprs location registration types
        GSN-Address
-
 ;
 
 IMPORTS
index 2c6ff949487cf98bc29102cb594f0fdd146470f5..28b2afcd2dac9d2583000ed69cb21a3bb6f1eeab 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12
+-- 3GPP TS 29.002 V9.1.0 (2010-03
 -- 17.4        MAP Dialogue Information
 
 MAP-DialogueInformation {
index d9daace1b9bd960cd1375676f06f92313310f4d7..3c04d1996bc335793dc632c8a3d07de3682c46f7 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.6      Errors
  
 MAP-Errors {
index 0b863259561648c7bf91751ece69cba4a78a3608..56ac0dcab19765fd666c9213708e92f62f7d2973 100644 (file)
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-ExtensionDataTypes.asn
 --
--- Taken from 3GPP TS 29.002 V9.0.0 (2009-12)
+-- Taken from 3GPP TS 29.002 V9.1.0 (2010-03)
 --
 -- 17.7.11 Extension data types
 --
index a3fa6ac5963c16673e380242027c434265bf6c94..d0fae425512bb18124af3b138290b7ef5ac27bdd 100644 (file)
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- Taken from 3GPP TS 29.002 V9.0.0 (2009-12)
+-- Taken from 3GPP TS 29.002 V9.1.0 (2010-03)
 --
 --17.7.12      Group Call data types
  
@@ -76,7 +76,8 @@ PrepareGroupCallArg ::= SEQUENCE {
        ...,
        vstk                    [5] VSTK                OPTIONAL,
        vstk-rand               [6] VSTK-RAND   OPTIONAL,
-       talkerChannelParameter  [7] NULL                OPTIONAL }
+       talkerChannelParameter  [7] NULL                OPTIONAL,
+       uplinkReplyIndicator    [8] NULL                OPTIONAL}
 
 VSTK ::= OCTET STRING (SIZE (16))
 
index bad0217512db7d0c852bbc25624c4ff64823501f..ccd6622d0cd87b98a75d13ebb03c3c219a8efc74 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.7      Group Call operations
  
 MAP-Group-Call-Operations {
index f4cee8b25febb36dd2676ca324094d1c86c917fb..d44b8559017cbf29f5c43d006bac74ebb7524687 100644 (file)
@@ -1,7 +1,7 @@
 -- $Id$
 -- MAP-LCS-DataTypes.asn
 --
--- Taken from 3GPP TS 29.002  V9.0.0 (2009-12)
+-- Taken from 3GPP TS 29.002  V9.1.0 (2010-03)
 --
 -- 17.7.13 Location service data types
 --
@@ -102,7 +102,7 @@ RoutingInfoForLCS-Res ::= SEQUENCE {
 
 LCSLocationInfo ::= SEQUENCE {
        networkNode-Number      ISDN-AddressString,
-       -- NetworkNode-number can be either msc-number or sgsn-number
+       -- NetworkNode-number can be msc-number, sgsn-number or a dummy value of "0"
        lmsi                    [0] LMSI                OPTIONAL,
        extensionContainer      [1] ExtensionContainer  OPTIONAL,
        ... ,
@@ -110,7 +110,9 @@ LCSLocationInfo ::= SEQUENCE {
        -- gprsNodeIndicator is set only if the SGSN number is sent as the Network Node Number
        additional-Number       [3] Additional-Number   OPTIONAL,
        supportedLCS-CapabilitySets     [4]     SupportedLCS-CapabilitySets     OPTIONAL,
-       additional-LCS-CapabilitySets   [5]     SupportedLCS-CapabilitySets     OPTIONAL
+       additional-LCS-CapabilitySets   [5]     SupportedLCS-CapabilitySets     OPTIONAL,
+       mme-Name                [6]     DiameterIdentity        OPTIONAL,
+       aaa-Server-Name [8]     DiameterIdentity        OPTIONAL
        }
 
 ProvideSubscriberLocation-Arg ::= SEQUENCE {
@@ -402,7 +404,8 @@ ProvideSubscriberLocation-Res ::= SEQUENCE {
        sai-Present     [7] NULL                OPTIONAL,
        accuracyFulfilmentIndicator     [8] AccuracyFulfilmentIndicator         OPTIONAL,
        velocityEstimate        [9] VelocityEstimate    OPTIONAL,
-       mo-lrShortCircuitIndicator      [10] NULL               OPTIONAL }
+       mo-lrShortCircuitIndicator      [10] NULL               OPTIONAL,
+       targetServingNodeForHandover    [11] ServingNodeAddress OPTIONAL }
 
 --     if deferredmt-lrResponseIndicator is set, locationEstimate is ignored.
 
@@ -575,7 +578,8 @@ SubscriberLocationReport-Arg ::= SEQUENCE {
        velocityEstimate        [20] VelocityEstimate   OPTIONAL,
        sequenceNumber  [21] SequenceNumber     OPTIONAL,
        periodicLDRInfo [22] PeriodicLDRInfo    OPTIONAL,
-       mo-lrShortCircuitIndicator      [23] NULL               OPTIONAL }
+       mo-lrShortCircuitIndicator      [23] NULL               OPTIONAL,
+       targetServingNodeForHandover    [24] ServingNodeAddress OPTIONAL }
 
        -- one of msisdn or imsi is mandatory
        -- a location estimate that is valid for the locationEstimate parameter should 
@@ -607,7 +611,8 @@ LCS-Event ::= ENUMERATED {
        mo-lr  (2),
        ...,
        deferredmt-lrResponse  (3) ,
-       deferredmo-lrTTTPInitiation  (4)  }
+       deferredmo-lrTTTPInitiation  (4),
+       emergencyCallHandover (5)  }
        --      deferredmt-lrResponse is applicable to the delivery of a location estimate 
        --      for an LDR initiated earlier by either the network (via an MT-LR activate deferred 
        --      location) or the UE (via a deferred MO-LR TTTP initiation)
@@ -637,6 +642,14 @@ TerminationCause ::= ENUMERATED {
 
 SequenceNumber ::= INTEGER (1..maxReportingAmount)
 
+ServingNodeAddress ::= CHOICE {
+       msc-Number      [0] ISDN-AddressString,
+       sgsn-Number     [1] ISDN-AddressString,
+       mme-Number      [2] DiameterIdentity }
+
+DiameterIdentity ::= OCTET STRING (SIZE(9..255))
+-- content of DiameterIdentity is defined in IETF RFC 3588 [139]
+
 SubscriberLocationReport-Res ::= SEQUENCE {
        extensionContainer      ExtensionContainer      OPTIONAL, 
        ..., 
index e226ef9b755d8430ad281595b361ebe14c7e6a79..25c160dea4c7f4cf1028fcc48be09387a9196841 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.8      Location service operations
  
 MAP-LocationServiceOperations {
index 91cb6174840976585a4d1e68121bde01c2c4996f..a6470854998330b76f99cfedd4c999cf7f02342a 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12
+-- 3GPP TS 29.002 V9.1.0 (2010-03
 -- 17.7.1      Mobile Service data types
 
 MAP-MS-DataTypes {
@@ -555,7 +555,12 @@ SGSN-Capability ::= SEQUENCE{
        supportedLCS-CapabilitySets     [5]  SupportedLCS-CapabilitySets        OPTIONAL,
        offeredCamel4CSIs       [6] OfferedCamel4CSIs   OPTIONAL,
        smsCallBarringSupportIndicator  [7]     NULL            OPTIONAL,       supportedRAT-TypesIndicator     [8]     SupportedRAT-Types      OPTIONAL,
-       supportedFeatures       [9] SupportedFeatures   OPTIONAL }
+       supportedFeatures       [9] SupportedFeatures   OPTIONAL,
+       t-adsDataRetrieval      [10] NULL               OPTIONAL,
+       homogeneousSupportOfIMSVoiceOverPSSessions [11] BOOLEAN OPTIONAL
+       --      "true" indicates homogeneous support, "false" indicates homogeneous non-support
+       --      in the complete SGSN area
+ }
 
 SupportedFeatures::= BIT STRING {
        odb-all-apn (0),
@@ -612,7 +617,9 @@ ForwardAccessSignalling-Arg ::= [3] SEQUENCE {
        rab-ConfigurationIndicator      [13] NULL               OPTIONAL,
        iuSelectedCodec [14]    Codec   OPTIONAL,
        alternativeChannelType  [15]    RadioResourceInformation        OPTIONAL,
-       tracePropagationList    [17]    TracePropagationList    OPTIONAL }
+       tracePropagationList    [17]    TracePropagationList    OPTIONAL,
+       aoipSupportedCodecsListAnchor   [18] AoIPCodecsList     OPTIONAL,
+       aoipSelectedCodecTarget [19] AoIPCodec  OPTIONAL }
 
 AllowedGSM-Algorithms ::= OCTET STRING (SIZE (1))
        -- internal structure is coded as Algorithm identifier octet from
@@ -682,7 +689,8 @@ PrepareHO-Arg ::= [3] SEQUENCE {
        uesbi-Iu                [21]    UESBI-Iu        OPTIONAL,
        imeisv          [22]    IMEI            OPTIONAL,
        alternativeChannelType  [23]    RadioResourceInformation        OPTIONAL,
-       tracePropagationList    [25]    TracePropagationList    OPTIONAL         }
+       tracePropagationList    [25]    TracePropagationList    OPTIONAL,
+       aoipSupportedCodecsListAnchor   [26] AoIPCodecsList     OPTIONAL         }
 
 BSSMAP-ServiceHandoverList ::= SEQUENCE SIZE (1.. maxNumOfServiceHandovers) OF
                                BSSMAP-ServiceHandoverInfo
@@ -728,7 +736,9 @@ PrepareHO-Res ::= [3] SEQUENCE {
        extensionContainer      [4]     ExtensionContainer      OPTIONAL,
        ...,
        iuSelectedCodec [7] Codec               OPTIONAL,
-       iuAvailableCodecsList   [8] CodecList   OPTIONAL }
+       iuAvailableCodecsList   [8] CodecList   OPTIONAL,
+       aoipSelectedCodecTarget [9] AoIPCodec   OPTIONAL,
+       aoipAvailableCodecsListMap      [10] AoIPCodecsList     OPTIONAL }
 
 SelectedUMTS-Algorithms ::= SEQUENCE {
        integrityProtectionAlgorithm    [0]     ChosenIntegrityProtectionAlgorithm      OPTIONAL,
@@ -785,7 +795,32 @@ ProcessAccessSignalling-Arg ::= [3] SEQUENCE {
        extensionContainer      [0]     ExtensionContainer      OPTIONAL,
        ...,
        iUSelectedCodec [5] Codec               OPTIONAL,
-       iuAvailableCodecsList   [6] CodecList   OPTIONAL }
+       iuAvailableCodecsList   [6] CodecList   OPTIONAL,
+       aoipSelectedCodecTarget [7] AoIPCodec   OPTIONAL,
+       aoipAvailableCodecsListMap      [8] AoIPCodecsList      OPTIONAL }
+
+AoIPCodecsList ::= SEQUENCE {
+       codec1          [1] AoIPCodec,
+       codec2          [2] AoIPCodec           OPTIONAL,
+       codec3          [3] AoIPCodec           OPTIONAL,
+       codec4          [4] AoIPCodec           OPTIONAL,
+       codec5          [5] AoIPCodec           OPTIONAL,
+       codec6          [6] AoIPCodec           OPTIONAL,
+       codec7          [7] AoIPCodec           OPTIONAL,
+       codec8          [8] AoIPCodec           OPTIONAL,
+       extensionContainer      [9] ExtensionContainer          OPTIONAL,
+       ...}
+       -- Codecs are sent in priority order where codec1 has highest priority
+
+AoIPCodec ::= OCTET STRING (SIZE (1..3))
+
+       -- The internal structure is defined as follows:
+       -- octet 1      Coded as Speech Codec Elements in 3GPP TS 48.008
+       --                              with the exception that FI, PI, PT and TF bits shall
+       --                      be set to 0
+       -- octets 2,3   Optional; in case of AMR codec types it defines
+       --                      the supported codec configurations as defined in
+       --                      3GPP TS 48.008
 
 SupportedCodecsList ::= SEQUENCE {
        utranCodecList  [0] CodecList   OPTIONAL,
@@ -920,7 +955,7 @@ EPC-AV ::= SEQUENCE {
        extensionContainer      ExtensionContainer      OPTIONAL,
        ...}
 
-KASME ::= OCTET STRING (SIZE (16))
+KASME ::= OCTET STRING (SIZE (32))
 
 RequestingNodeType ::= ENUMERATED {
        vlr  (0),
@@ -1118,7 +1153,7 @@ PDN-GW-Identity ::= SEQUENCE {
        extensionContainer      [3] ExtensionContainer  OPTIONAL,
        ... }
 
-FQDN ::=  OCTET STRING (SIZE (9..100))
+FQDN ::=  OCTET STRING (SIZE (9..255))
 
 
 PDN-GW-AllocationType ::= ENUMERATED {
@@ -1194,9 +1229,18 @@ PDP-Context ::= SEQUENCE {
        -- ext3-QoS-Subscribed may be present only if ext2-QoS-Subscribed is present.
        ext4-QoS-Subscribed     [4] Ext4-QoS-Subscribed OPTIONAL,
        -- ext4-QoS-Subscribed may be present only if ext3-QoS-Subscribed is present. 
-       apn-oi-Replacement      [5]     APN-OI-Replacement      OPTIONAL
+       apn-oi-Replacement      [5]     APN-OI-Replacement      OPTIONAL,
        -- this apn-oi-Replacement refers to the APN level apn-oi-Replacement and has
        -- higher priority than UE level apn-oi-Replacement.
+       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
+       -- 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).
         }
 
 ContextId ::= INTEGER (1..maxNumOfPDP-Contexts)
@@ -1275,6 +1319,11 @@ APN ::=  OCTET STRING (SIZE (2..63))
 
 PDP-Type ::= OCTET STRING (SIZE (2))
        -- Octets are coded according to TS 3GPP TS 29.060 [105]
+       -- Only the values PPP, IPv4 and IPv6 are allowed for this parameter.
+
+Ext-PDP-Type ::= OCTET STRING (SIZE (2))
+       -- Octets are coded, similarly to PDP-Type, according to TS 3GPP TS 29.060 [105].
+       -- Only the value IPv4v6 is allowed for this parameter.
 
 PDP-Address ::= OCTET STRING (SIZE (1..16))
        -- Octets are coded according to TS 3GPP TS 29.060 [105]
@@ -2354,7 +2403,12 @@ SubscriberInfo ::= SEQUENCE {
        imei                    [5] IMEI                OPTIONAL,
        ms-Classmark2   [6] MS-Classmark2       OPTIONAL,
        gprs-MS-Class   [7] GPRSMSClass OPTIONAL,
-       mnpInfoRes      [8] MNPInfoRes  OPTIONAL }
+       mnpInfoRes      [8] MNPInfoRes  OPTIONAL,
+       imsVoiceOverPS-SessionsIndication       [9] IMS-VoiceOverPS-SessionsInd OPTIONAL,
+       lastUE-ActivityTime     [10] Time               OPTIONAL,
+       lastRAT-Type    [11] Used-RAT-Type      OPTIONAL,
+       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.
@@ -2362,6 +2416,11 @@ SubscriberInfo ::= SEQUENCE {
 --     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)
+       }
+
 MNPInfoRes ::= SEQUENCE {
        routeingNumber  [0] RouteingNumber      OPTIONAL,
        imsi                    [1] IMSI                OPTIONAL,
@@ -2416,16 +2475,19 @@ RequestedInfo ::= SEQUENCE {
        requestedDomain [4] DomainType  OPTIONAL,
        imei                    [6] NULL                OPTIONAL,
        ms-classmark    [5] NULL                OPTIONAL,
-       mnpRequestedInfo        [7] NULL                OPTIONAL }
+       mnpRequestedInfo        [7] NULL                OPTIONAL,
+       t-adsData               [8] NULL                OPTIONAL }
 
 --     currentLocation shall be absent if locationInformation is absent
+--     t-adsData shall be absent in messages sent to the VLR
 
 DomainType ::=  ENUMERATED {
        cs-Domain               (0),
        ps-Domain               (1),
-       ...}
+       ...,
+       eps-Domain      (2)}
 -- exception handling:
--- reception of values > 1 shall be mapped to 'cs-Domain'
+-- reception of values > 2 shall be mapped to 'cs-Domain'
 
 LocationInformation ::= SEQUENCE {
        ageOfLocationInformation        AgeOfLocationInformation        OPTIONAL,
@@ -2440,11 +2502,17 @@ LocationInformation ::= SEQUENCE {
        geodeticInformation     [7] GeodeticInformation OPTIONAL, 
        currentLocationRetrieved        [8] NULL                OPTIONAL,
        sai-Present     [9] NULL                OPTIONAL,
-       locationInformationEPS  [10]LocationInformationEPS      OPTIONAL }
+       locationInformationEPS  [10] LocationInformationEPS     OPTIONAL,
+       userCSGInformation      [11] UserCSGInformation OPTIONAL }
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- 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. 
+-- 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,
@@ -2452,7 +2520,14 @@ LocationInformationEPS ::= SEQUENCE {
        trackingAreaIdentity    [1] OCTET STRING (SIZE(6))              OPTIONAL,
 -- Octets are coded as described in 3GPP TS 29.118.
        extensionContainer      [2] ExtensionContainer          OPTIONAL,
+       geographicalInformation [3] GeographicalInformation             OPTIONAL,
+       geodeticInformation     [4] GeodeticInformation         OPTIONAL,
+       currentLocationRetrieved        [5] NULL                        OPTIONAL,
+       ageOfLocationInformation        [6] AgeOfLocationInformation            OPTIONAL,
        ...}
+-- currentLocationRetrieved shall be present if the location information
+-- was retrieved after successful paging.
+
 
 LocationInformationGPRS ::= SEQUENCE {
        cellGlobalIdOrServiceAreaIdOrLAI        [0] CellGlobalIdOrServiceAreaIdOrLAI OPTIONAL,
@@ -2465,11 +2540,23 @@ LocationInformationGPRS ::= SEQUENCE {
        sai-Present     [6] NULL                OPTIONAL,
        geodeticInformation     [7] GeodeticInformation OPTIONAL,
        currentLocationRetrieved        [8] NULL                OPTIONAL,
-       ageOfLocationInformation        [9] AgeOfLocationInformation    OPTIONAL }
+       ageOfLocationInformation        [9] AgeOfLocationInformation    OPTIONAL,
+       userCSGInformation      [10] UserCSGInformation OPTIONAL }
 -- sai-Present indicates that the cellGlobalIdOrServiceAreaIdOrLAI parameter contains
 -- a Service Area Identity.
 -- currentLocationRetrieved shall be present if the location information
 -- was retrieved after successful paging.
+-- UserCSGInformation contains the CSG ID, Access mode, and the CSG Membership Indication in
+-- the case the Access mode is Hybrid Mode. 
+
+
+UserCSGInformation ::= SEQUENCE {
+       csg-Id          [0] CSG-Id,
+       extensionContainer      [1] ExtensionContainer          OPTIONAL,
+       ...,
+       accessMode      [2] OCTET STRING (SIZE(1))              OPTIONAL,
+       cmi                     [3] OCTET STRING (SIZE(1))              OPTIONAL }
+-- The encoding of the accessMode and cmi parameters are as defined in 3GPP TS 29.060 [105].
 
 RAIdentity ::= OCTET STRING (SIZE (6))
 -- Routing Area Identity is coded in accordance with 3GPP TS 29.060 [105].
@@ -2509,7 +2596,7 @@ SubscriberState ::= CHOICE {
        notProvidedFromVLR      [2] NULL}
 
 PS-SubscriberState ::= CHOICE {
-       notProvidedFromSGSN     [0] NULL,
+       notProvidedFromSGSNorMME        [0] NULL,
        ps-Detached     [1] NULL,
        ps-AttachedNotReachableForPaging        [2] NULL,
        ps-AttachedReachableForPaging   [3] NULL,
@@ -2546,12 +2633,28 @@ PDP-ContextInfo ::= SEQUENCE {
        -- qos2-Requested may be present only if qos-Requested is present.
        qos2-Negotiated [20] Ext2-QoS-Subscribed        OPTIONAL,
        -- qos2-Negotiated may be present only if qos-Negotiated is present.
-               qos3-Subscribed [21] Ext3-QoS-Subscribed        OPTIONAL,
+       qos3-Subscribed [21] Ext3-QoS-Subscribed        OPTIONAL,
        -- qos3-Subscribed may be present only if qos2-Subscribed is present.
        qos3-Requested  [22] Ext3-QoS-Subscribed        OPTIONAL,
        -- qos3-Requested may be present only if qos2-Requested is present.
-       qos3-Negotiated [23] Ext3-QoS-Subscribed        OPTIONAL
+       qos3-Negotiated [23] Ext3-QoS-Subscribed        OPTIONAL,
        -- qos3-Negotiated may be present only if qos2-Negotiated is present.
+       qos4-Subscribed [25] Ext4-QoS-Subscribed        OPTIONAL,
+       -- qos4-Subscribed may be present only if qos3-Subscribed is present.
+       qos4-Requested  [26] Ext4-QoS-Subscribed        OPTIONAL,
+       -- qos4-Requested may be present only if qos3-Requested is present.
+       qos4-Negotiated [27] Ext4-QoS-Subscribed        OPTIONAL,
+       -- qos4-Negotiated may be present only if qos3-Negotiated is present. 
+       ext-pdp-Type    [28] 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 [29] 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).
+
 }
 
 NSAPI ::= INTEGER (0..15)
@@ -2613,7 +2716,8 @@ AnyTimeSubscriptionInterrogationRes ::= SEQUENCE {
        ... ,
        offeredCamel4CSIsInVLR  [8] OfferedCamel4CSIs   OPTIONAL,
        offeredCamel4CSIsInSGSN [9] OfferedCamel4CSIs   OPTIONAL,
-       msisdn-BS-List  [10] MSISDN-BS-List     OPTIONAL }
+       msisdn-BS-List  [10] MSISDN-BS-List     OPTIONAL,
+       csg-SubscriptionDataList        [11] CSG-SubscriptionDataList   OPTIONAL }
 
 RequestedSubscriptionInfo ::= SEQUENCE {
        requestedSS-Info        [1] SS-ForBS-Code       OPTIONAL,
@@ -2626,7 +2730,8 @@ RequestedSubscriptionInfo ::= SEQUENCE {
        additionalRequestedCAMEL-SubscriptionInfo
                                [7] AdditionalRequestedCAMEL-SubscriptionInfo
                                                        OPTIONAL,
-       msisdn-BS-List  [8] NULL                OPTIONAL }
+       msisdn-BS-List  [8] NULL                OPTIONAL,
+       csg-SubscriptionDataRequested   [9] NULL                OPTIONAL }
 
 MSISDN-BS-List ::= SEQUENCE SIZE (1..maxNumOfMSISDN) OF
                                MSISDN-BS
@@ -2720,7 +2825,13 @@ 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 }
+       activationRequestForUE-reachability     [9]     ServingNode     OPTIONAL,
+       modificationRequestFor-CSG      [10]    ModificationRequestFor-CSG      OPTIONAL }
+
+ModificationRequestFor-CSG ::= SEQUENCE {
+       modifyNotificationToCSE [0]     ModificationInstruction OPTIONAL,
+       extensionContainer      [1]     ExtensionContainer      OPTIONAL,
+       ...}
 
 ServingNode ::= BIT STRING {
        mme (0)} (SIZE (1..8))
@@ -2793,7 +2904,8 @@ NoteSubscriberDataModifiedArg ::= SEQUENCE {
        allInformationSent      [4] NULL                OPTIONAL,
        extensionContainer      ExtensionContainer      OPTIONAL,
        ...,
-       ue-reachable    [5] ServingNode OPTIONAL }
+       ue-reachable    [5] ServingNode OPTIONAL,
+       csg-SubscriptionDataList        [6] CSG-SubscriptionDataList    OPTIONAL }
 
 NoteSubscriberDataModifiedRes ::= SEQUENCE {
        extensionContainer      ExtensionContainer      OPTIONAL,
index 73bd676c99211a1f6f1890f9b759d41d435d796e..d9a18313f9386b3896f8c8eeb398e9f6655272cf 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V8.4.0 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 V9.0.0 (2010-03)
 -- 17.6.1      Mobile Service Operations
 
 MAP-MobileServiceOperations {
index 30e271c68665341eb2427183668644083f1e8316..c03d25fc2e08a57d7fbd73cb505bc3eded41dc69 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12
+-- 3GPP TS 29.002 V9.1.0 (2010-03
 --17.6.2       Operation and Maintenance Operations
 MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
index 041dcbe205eefc9b5f16ce1d228464726ec26b9c..3fed786585f7880adb26bec7ceb925b4eb470ca4 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 --17.5 MAP operation and error codes
 MAP-Protocol {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
index b801d019e477b260ce7c27a50e9913bd0e29d930..6e001453b188b5e770691116822f079b52198916 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002  V9.0.0 (2009-12)  
+-- 3GPP TS 29.002  V9.1.0 (2010-03)  
 -- 17.7.6      Short message data types
 
 MAP-SM-DataTypes {
@@ -267,4 +267,3 @@ maxNumOfDispatchers  INTEGER ::= 5
 
 
 END
-
index ce64d47a78015a67c28a37d99f77f98235758c25..ffb39e01a7d53016c3f8c398fc4b61525673f1e8 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)
+-- 3GPP TS 29.002 V9.1.0 (2010-03)
 -- 17.7.5      Supplementary service codes
 
 MAP-SS-Code {
index ec7d6b44cd8721a2a716c6829fce212377ca1da9..ffcd54c281078790a9df218293b5aa0cc9e8240d 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.7.4      Supplementary service data types
  
 MAP-SS-DataTypes {
index bf63e4c38a9343f2b779c92387aaeca40613876b..e70edf5ca33c77fbb3047dc8a7612de7a8e5ee0b 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 -- 17.6.5      Short message service operations
  
 MAP-ShortMessageServiceOperations {
index 2d00ee4b89ed3e8d03d2eac76abbb523f12a9edd..26fec3f90666ff67c5ceec5ba12a6051091862bb 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12)  
+-- 3GPP TS 29.002 V9.1.0 (2010-03)  
 --17.6.4       Supplementary service operations
 
 MAP-SupplementaryServiceOperations {
index 961a3417d918231b621e7a5ddfa864d7b90d3bda..8b977c3b5e42d9f50584abc8d93f12d7f6b55f19 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 29.002 V9.0.0 (2009-12
+-- 3GPP TS 29.002 V9.1.0 (2010-03
 -- 17.7.9      Teleservice Codes
  
 MAP-TS-Code {
index 49c1c9567b4d37a6a56d3c4da0e042d17718ba63..034b240fee7f31d2fddef73557e23b007018524e 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V9.0.0 (2009-12)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.4.2       ASN.1 data types
 SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
@@ -27,7 +27,7 @@ FROM MAP-SS-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-SS-DataTypes (14) version10 (10)}
 
--- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes
+--- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes
 CUG-Index,
 NotificationToMSUser
 FROM MAP-MS-DataTypes {
@@ -41,9 +41,8 @@ AlertingPattern,
 LCSClientExternalID,
 AddressString,
 LCSServiceTypeID,
-AgeOfLocationInformation,
-GSN-Address -- WS fix
-
+GSN-Address, -- WS fix
+AgeOfLocationInformation
 FROM MAP-CommonDataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3)
    map-CommonDataTypes (18) version10 (10)}
@@ -312,7 +311,8 @@ LCS-MOLRArg ::= SEQUENCE {
        sequenceNumber          [17] SequenceNumber             OPTIONAL,
        terminationCause        [18] TerminationCause           OPTIONAL,
        mo-lrShortCircuit       [19]    NULL                            OPTIONAL,
-       ganssAssistanceData     [20] GANSSAssistanceData        OPTIONAL }
+       ganssAssistanceData     [20] GANSSAssistanceData        OPTIONAL,
+       multiplePositioningProtocolPDUs [21] MultiplePositioningProtocolPDUs    OPTIONAL }
 -- The parameter locationMethod shall be included if and only if the molr-Type is set to value 
 -- deCipheringKeys or assistanceData.
 -- The parameter gpsAssistanceData shall be included if and only if the molr-Type is set to value 
@@ -321,6 +321,21 @@ LCS-MOLRArg        ::= SEQUENCE {
 -- assistanceData and locationMethod is set to value assistedGANSS or assistedGPSandGANSS.
 -- supportedGADShapes shall not be included for deferred MO-LR initiation or deferred MO-LR or MT-LR
 -- responses 
+-- multiplePositioningProtocolPDUs may only be included for E-UTRAN access.
+-- locationMethod shall not be included for E-UTRAN access.
+-- gpsAssistanceData shall not be included for E-UTRAN access.
+-- h-gmlc-address shall not be included for E-UTRAN access.
+-- locationEstimate shall not be included for E-UTRAN access.
+-- velocityEstimate shall not be included for E-UTRAN access.
+-- referenceNumber shall not be included for E-UTRAN access.
+-- periodicLDRInfo shall not be included for E-UTRAN access.
+-- locationUpdateRequest shall not be included for E-UTRAN access.
+-- sequenceNumber shall not be included for E-UTRAN access.
+-- terminationCause shall not be included for E-UTRAN access.
+-- mo-lrShortCircuit shall not be included for E-UTRAN access.
+-- ganssAssistanceData shall not be included for E-UTRAN access.
+
+
 
 MOLR-Type::= ENUMERATED {
        locationEstimate                        (0),
@@ -333,7 +348,9 @@ MOLR-Type::= ENUMERATED {
        deferredMt-lrOrmo-lrCancellation (6)}
 -- exception handling:
 -- an unrecognized value shall be rejected by the receiver with a return error cause of
--- unexpected data value.
+-- unexpected data value. 
+-- For E-UTRAN access, only locationEstimate or assistanceData shall be included
+
 
 LocationMethod::= ENUMERATED {
        msBasedEOTD                     (0),
@@ -367,6 +384,14 @@ TerminationCause ::= ENUMERATED {
        uETermination     (1),
        ...} 
 
+MultiplePositioningProtocolPDUs ::= SEQUENCE (SIZE (1..maxNumLPPMsg)) OF PositioningProtocolPDU
+
+PositioningProtocolPDU ::= OCTET STRING
+-- PositioningProtocolPDU contains a LPP message defined in 3GPP TS 36.355 [17].
+
+maxNumLPPMsg INTEGER ::= 3
+
+
 
 LCS-MOLRRes::= SEQUENCE {
        locationEstimate                [0]     Ext-GeographicalInformation             OPTIONAL,
@@ -394,6 +419,12 @@ LCS-MOLRRes::= SEQUENCE {
 -- in LocationRequestArg was set to value deCipheringKeys.
 -- Parameter velocityEstimate may only be included if the lcs-QoS in LCS-MOLRarg includes
 -- velocityRequest
+-- decipheringKeys shall not be included for E-UTRAN access.
+-- referenceNumber shall not be included for E-UTRAN access.
+-- h-gmlc-address shall not be included for E-UTRAN access.
+-- mo-lrShortCircuit shall not be included for E-UTRAN access.
+-- reportingPLMNList shall not be included for E-UTRAN access.
+
 
 
 DecipheringKeys::= OCTET STRING (SIZE (15))
index 233d363fcb3b3b5c0e1132b2b4016df1bfff00c1..6c48975c00464ab25c188e76f667192fe9bb8ba5 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V9.0.0 (2009-12)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.3.1       Errors ASN.1 specification
 -- The following ASN.1 module provides an ASN.1 specification of errors. Errors from MAP are imported in the SS Protocol module in subclause 4.5. The module defines errors by allocating them a local value. For the involved errors the same local values as in MAP are allocated.
 
@@ -43,3 +43,4 @@ rejectedByUser  ERROR ::= {
        CODE    local:121 }
 
 END
+
index 9003c91a15bfd8429263d4ea4c5fa643a2890ff9..e239c18cefea094c755efac7e81facf82a13ada4 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V9.0.0 (2009-12)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.2 Operation types
 SS-Operations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3)
index 6ac9532c0c3562409f11c7862653eec41fead481..6985b9ab5beab1b6b89bfbc08757ebef85868593 100644 (file)
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 24.080 V7.4.0 (2007-09)
+-- 3GPP TS 24.080 V9.1.0 (2010-03)
 -- 4.5 Operations and errors implementation
 -- For the actual implementation of supplementary services, operations and errors have to be defined by value. The following ASN.1 module, imports operation from the ASN.1 module described in subclause 4.2 and operations and errors from MAP. 
 
index c431c6af985ca416cb7d13db0d62d52f83b1cf01..d2b28cee5e25be21d6f5ecd748911ab15f9dcf89 100644 (file)
@@ -547,6 +547,8 @@ static int hf_gsm_map_ms_contextId = -1;          /* ContextId */
 static int hf_gsm_map_ms_gprsEnhancementsSupportIndicator = -1;  /* NULL */
 static int hf_gsm_map_ms_smsCallBarringSupportIndicator = -1;  /* NULL */
 static int hf_gsm_map_ms_supportedFeatures = -1;  /* SupportedFeatures */
+static int hf_gsm_map_ms_t_adsDataRetrieval = -1;  /* NULL */
+static int hf_gsm_map_ms_homogeneousSupportOfIMSVoiceOverPSSessions = -1;  /* BOOLEAN */
 static int hf_gsm_map_ms_sgsn_mmeSeparationSupported = -1;  /* NULL */
 static int hf_gsm_map_ms_an_APDU = -1;            /* AccessNetworkSignalInfo */
 static int hf_gsm_map_ms_integrityProtectionInfo = -1;  /* IntegrityProtectionInformation */
@@ -565,6 +567,8 @@ static int hf_gsm_map_ms_rab_ConfigurationIndicator = -1;  /* NULL */
 static int hf_gsm_map_ms_iuSelectedCodec = -1;    /* Codec */
 static int hf_gsm_map_ms_alternativeChannelType = -1;  /* RadioResourceInformation */
 static int hf_gsm_map_ms_tracePropagationList = -1;  /* TracePropagationList */
+static int hf_gsm_map_ms_aoipSupportedCodecsListAnchor = -1;  /* AoIPCodecsList */
+static int hf_gsm_map_ms_aoipSelectedCodecTarget = -1;  /* AoIPCodec */
 static int hf_gsm_map_ms_integrityProtectionAlgorithms = -1;  /* PermittedIntegrityProtectionAlgorithms */
 static int hf_gsm_map_ms_encryptionAlgorithms = -1;  /* PermittedEncryptionAlgorithms */
 static int hf_gsm_map_ms_targetCellId = -1;       /* GlobalCellId */
@@ -585,6 +589,7 @@ static int hf_gsm_map_ms_multipleBearerNotSupported = -1;  /* NULL */
 static int hf_gsm_map_ms_selectedUMTS_Algorithms = -1;  /* SelectedUMTS_Algorithms */
 static int hf_gsm_map_ms_chosenRadioResourceInformation = -1;  /* ChosenRadioResourceInformation */
 static int hf_gsm_map_ms_iuAvailableCodecsList = -1;  /* CodecList */
+static int hf_gsm_map_ms_aoipAvailableCodecsListMap = -1;  /* AoIPCodecsList */
 static int hf_gsm_map_ms_integrityProtectionAlgorithm = -1;  /* ChosenIntegrityProtectionAlgorithm */
 static int hf_gsm_map_ms_encryptionAlgorithm = -1;  /* ChosenEncryptionAlgorithm */
 static int hf_gsm_map_ms_chosenChannelInfo = -1;  /* ChosenChannelInfo */
@@ -593,16 +598,24 @@ static int hf_gsm_map_ms_targetMSC_Number = -1;   /* ISDN_AddressString */
 static int hf_gsm_map_ms_selectedRab_Id = -1;     /* RAB_Id */
 static int hf_gsm_map_ms_selectedGSM_Algorithm = -1;  /* SelectedGSM_Algorithm */
 static int hf_gsm_map_ms_iUSelectedCodec = -1;    /* Codec */
+static int hf_gsm_map_ms_codec1 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec2 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec3 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec4 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec5 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec6 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec7 = -1;             /* AoIPCodec */
+static int hf_gsm_map_ms_codec8 = -1;             /* AoIPCodec */
 static int hf_gsm_map_ms_utranCodecList = -1;     /* CodecList */
 static int hf_gsm_map_ms_geranCodecList = -1;     /* CodecList */
-static int hf_gsm_map_ms_codec1 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec2 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec3 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec4 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec5 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec6 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec7 = -1;             /* Codec */
-static int hf_gsm_map_ms_codec8 = -1;             /* Codec */
+static int hf_gsm_map_ms_codec1_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec2_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec3_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec4_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec5_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec6_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec7_01 = -1;          /* Codec */
+static int hf_gsm_map_ms_codec8_01 = -1;          /* Codec */
 static int hf_gsm_map_ms_RelocationNumberList_item = -1;  /* RelocationNumber */
 static int hf_gsm_map_ms_immediateResponsePreferred = -1;  /* NULL */
 static int hf_gsm_map_ms_re_synchronisationInfo = -1;  /* Re_synchronisationInfo */
@@ -666,6 +679,8 @@ static int hf_gsm_map_ms_pdp_ChargingCharacteristics = -1;  /* ChargingCharacter
 static int hf_gsm_map_ms_ext2_QoS_Subscribed = -1;  /* Ext2_QoS_Subscribed */
 static int hf_gsm_map_ms_ext3_QoS_Subscribed = -1;  /* Ext3_QoS_Subscribed */
 static int hf_gsm_map_ms_ext4_QoS_Subscribed = -1;  /* Ext4_QoS_Subscribed */
+static int hf_gsm_map_ms_ext_pdp_Type = -1;       /* Ext_PDP_Type */
+static int hf_gsm_map_ms_ext_pdp_Address = -1;    /* PDP_Address */
 static int hf_gsm_map_ms_gprsDataList = -1;       /* GPRSDataList */
 static int hf_gsm_map_ms_gprs_CSI = -1;           /* GPRS_CSI */
 static int hf_gsm_map_ms_mo_sms_CSI = -1;         /* SMS_CSI */
@@ -844,6 +859,11 @@ static int hf_gsm_map_ms_ps_SubscriberState = -1;  /* PS_SubscriberState */
 static int hf_gsm_map_ms_ms_Classmark2 = -1;      /* MS_Classmark2 */
 static int hf_gsm_map_ms_gprs_MS_Class = -1;      /* GPRSMSClass */
 static int hf_gsm_map_ms_mnpInfoRes = -1;         /* MNPInfoRes */
+static int hf_gsm_map_ms_imsVoiceOverPS_SessionsIndication = -1;  /* IMS_VoiceOverPS_SessionsInd */
+static int hf_gsm_map_ms_lastUE_ActivityTime = -1;  /* Time */
+static int hf_gsm_map_ms_lastRAT_Type = -1;       /* Used_RAT_Type */
+static int hf_gsm_map_ms_eps_SubscriberState = -1;  /* PS_SubscriberState */
+static int hf_gsm_map_ms_locationInformationEPS = -1;  /* LocationInformationEPS */
 static int hf_gsm_map_ms_routeingNumber = -1;     /* RouteingNumber */
 static int hf_gsm_map_ms_numberPortabilityStatus = -1;  /* NumberPortabilityStatus */
 static int hf_gsm_map_ms_mSNetworkCapability = -1;  /* MSNetworkCapability */
@@ -855,6 +875,7 @@ static int hf_gsm_map_ms_requestedDomain = -1;    /* DomainType */
 static int hf_gsm_map_ms_imei_01 = -1;            /* NULL */
 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_ageOfLocationInformation = -1;  /* AgeOfLocationInformation */
 static int hf_gsm_map_ms_geographicalInformation = -1;  /* GeographicalInformation */
 static int hf_gsm_map_ms_vlr_number = -1;         /* ISDN_AddressString */
@@ -864,16 +885,18 @@ static int hf_gsm_map_ms_selectedLSA_Id = -1;     /* LSAIdentity */
 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_locationInformationEPS = -1;  /* LocationInformationEPS */
+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_6 */
 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 */
+static int hf_gsm_map_ms_cmi = -1;                /* OCTET_STRING_SIZE_1 */
 static int hf_gsm_map_ms_assumedIdle = -1;        /* NULL */
 static int hf_gsm_map_ms_camelBusy = -1;          /* NULL */
 static int hf_gsm_map_ms_netDetNotReachable = -1;  /* NotReachableReason */
 static int hf_gsm_map_ms_notProvidedFromVLR = -1;  /* NULL */
-static int hf_gsm_map_ms_notProvidedFromSGSN = -1;  /* NULL */
+static int hf_gsm_map_ms_notProvidedFromSGSNorMME = -1;  /* NULL */
 static int hf_gsm_map_ms_ps_Detached = -1;        /* NULL */
 static int hf_gsm_map_ms_ps_AttachedNotReachableForPaging = -1;  /* NULL */
 static int hf_gsm_map_ms_ps_AttachedReachableForPaging = -1;  /* NULL */
@@ -899,6 +922,9 @@ static int hf_gsm_map_ms_qos2_Negotiated = -1;    /* Ext2_QoS_Subscribed */
 static int hf_gsm_map_ms_qos3_Subscribed = -1;    /* Ext3_QoS_Subscribed */
 static int hf_gsm_map_ms_qos3_Requested = -1;     /* Ext3_QoS_Subscribed */
 static int hf_gsm_map_ms_qos3_Negotiated = -1;    /* Ext3_QoS_Subscribed */
+static int hf_gsm_map_ms_qos4_Subscribed = -1;    /* Ext4_QoS_Subscribed */
+static int hf_gsm_map_ms_qos4_Requested = -1;     /* Ext4_QoS_Subscribed */
+static int hf_gsm_map_ms_qos4_Negotiated = -1;    /* Ext4_QoS_Subscribed */
 static int hf_gsm_map_ms_subscriberIdentity = -1;  /* SubscriberIdentity */
 static int hf_gsm_map_ms_requestedSubscriptionInfo = -1;  /* RequestedSubscriptionInfo */
 static int hf_gsm_map_ms_callForwardingData = -1;  /* CallForwardingData */
@@ -910,6 +936,7 @@ static int hf_gsm_map_ms_supportedSGSN_CAMEL_Phases = -1;  /* SupportedCamelPhas
 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_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 */
@@ -917,6 +944,7 @@ static int hf_gsm_map_ms_supportedVLR_CAMEL_Phases_01 = -1;  /* NULL */
 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_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 */
@@ -935,9 +963,10 @@ static int hf_gsm_map_ms_modificationRequestFor_CSI = -1;  /* ModificationReques
 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_modificationRequestFor_CSG = -1;  /* ModificationRequestFor_CSG */
+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_forwardedToNumber_01 = -1;  /* AddressString */
-static int hf_gsm_map_ms_modifyNotificationToCSE = -1;  /* ModificationInstruction */
 static int hf_gsm_map_ms_odb_data = -1;           /* ODB_Data */
 static int hf_gsm_map_ms_requestedCamel_SubscriptionInfo = -1;  /* RequestedCAMEL_SubscriptionInfo */
 static int hf_gsm_map_ms_modifyCSI_State = -1;    /* ModificationInstruction */
@@ -964,7 +993,6 @@ static int hf_gsm_map_ms_sgsn_CAMEL_SubscriptionInfo = -1;  /* SGSN_CAMEL_Subscr
 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_csg_SubscriptionDataList = -1;  /* CSG_SubscriptionDataList */
 static int hf_gsm_map_ms_ue_ReachabilityRequestIndicator = -1;  /* NULL */
 /* named bits */
 static int hf_gsm_map_ms_SupportedRAT_Types_utran = -1;
@@ -1152,6 +1180,7 @@ static int hf_gsm_map_ch_allowedServices = -1;    /* AllowedServices */
 static int hf_gsm_map_ch_unavailabilityCause = -1;  /* UnavailabilityCause */
 static int hf_gsm_map_ch_releaseResourcesSupported = -1;  /* NULL */
 static int hf_gsm_map_ch_gsm_BearerCapability = -1;  /* ExternalSignalInfo */
+static int hf_gsm_map_ch_mtRoamingRetryIndicator = -1;  /* NULL */
 static int hf_gsm_map_ch_ccbs_Possible = -1;      /* NULL */
 static int hf_gsm_map_ch_keepCCBS_CallIndicator = -1;  /* NULL */
 static int hf_gsm_map_ch_roamingNumber = -1;      /* ISDN_AddressString */
@@ -1222,6 +1251,8 @@ static int hf_gsm_map_lcs_gprsNodeIndicator = -1;  /* NULL */
 static int hf_gsm_map_lcs_additional_Number = -1;  /* Additional_Number */
 static int hf_gsm_map_lcs_supportedLCS_CapabilitySets = -1;  /* SupportedLCS_CapabilitySets */
 static int hf_gsm_map_lcs_additional_LCS_CapabilitySets = -1;  /* SupportedLCS_CapabilitySets */
+static int hf_gsm_map_lcs_mme_Name = -1;          /* DiameterIdentity */
+static int hf_gsm_map_lcs_aaa_Server_Name = -1;   /* DiameterIdentity */
 static int hf_gsm_map_lcs_locationType = -1;      /* LocationType */
 static int hf_gsm_map_lcs_mlc_Number = -1;        /* ISDN_AddressString */
 static int hf_gsm_map_lcs_lcs_ClientID = -1;      /* LCS_ClientID */
@@ -1287,6 +1318,7 @@ static int hf_gsm_map_lcs_cellIdOrSai = -1;       /* CellGlobalIdOrServiceAreaId
 static int hf_gsm_map_lcs_sai_Present = -1;       /* NULL */
 static int hf_gsm_map_lcs_accuracyFulfilmentIndicator = -1;  /* AccuracyFulfilmentIndicator */
 static int hf_gsm_map_lcs_velocityEstimate = -1;  /* VelocityEstimate */
+static int hf_gsm_map_lcs_targetServingNodeForHandover = -1;  /* ServingNodeAddress */
 static int hf_gsm_map_lcs_lcs_Event = -1;         /* LCS_Event */
 static int hf_gsm_map_lcs_na_ESRD = -1;           /* ISDN_AddressString */
 static int hf_gsm_map_lcs_na_ESRK = -1;           /* ISDN_AddressString */
@@ -1295,6 +1327,9 @@ static int hf_gsm_map_lcs_deferredmt_lrData = -1;  /* Deferredmt_lrData */
 static int hf_gsm_map_lcs_pseudonymIndicator = -1;  /* NULL */
 static int hf_gsm_map_lcs_sequenceNumber = -1;    /* SequenceNumber */
 static int hf_gsm_map_lcs_terminationCause = -1;  /* TerminationCause */
+static int hf_gsm_map_lcs_msc_Number = -1;        /* ISDN_AddressString */
+static int hf_gsm_map_lcs_sgsn_Number = -1;       /* ISDN_AddressString */
+static int hf_gsm_map_lcs_mme_Number = -1;        /* DiameterIdentity */
 /* named bits */
 static int hf_gsm_map_lcs_DeferredLocationEventType_msAvailable = -1;
 static int hf_gsm_map_lcs_DeferredLocationEventType_enteringIntoArea = -1;
@@ -1323,6 +1358,7 @@ static int hf_gsm_map_gr_extensionContainer = -1;  /* ExtensionContainer */
 static int hf_gsm_map_gr_vstk = -1;               /* VSTK */
 static int hf_gsm_map_gr_vstk_rand = -1;          /* VSTK_RAND */
 static int hf_gsm_map_gr_talkerChannelParameter = -1;  /* NULL */
+static int hf_gsm_map_gr_uplinkReplyIndicator = -1;  /* NULL */
 static int hf_gsm_map_gr_groupCallNumber = -1;    /* ISDN_AddressString */
 static int hf_gsm_map_gr_imsi = -1;               /* IMSI */
 static int hf_gsm_map_gr_talkerPriority = -1;     /* TalkerPriority */
@@ -1523,6 +1559,8 @@ static int hf_gsm_ss_sequenceNumber = -1;         /* SequenceNumber */
 static int hf_gsm_ss_terminationCause = -1;       /* TerminationCause */
 static int hf_gsm_ss_mo_lrShortCircuit = -1;      /* NULL */
 static int hf_gsm_ss_ganssAssistanceData = -1;    /* GANSSAssistanceData */
+static int hf_gsm_ss_multiplePositioningProtocolPDUs = -1;  /* MultiplePositioningProtocolPDUs */
+static int hf_gsm_ss_MultiplePositioningProtocolPDUs_item = -1;  /* PositioningProtocolPDU */
 static int hf_gsm_ss_decipheringKeys = -1;        /* DecipheringKeys */
 static int hf_gsm_ss_add_LocationEstimate = -1;   /* Add_GeographicalInformation */
 static int hf_gsm_ss_reportingPLMNList = -1;      /* ReportingPLMNList */
@@ -1769,6 +1807,7 @@ static gint ett_gsm_map_ms_ChosenRadioResourceInformation = -1;
 static gint ett_gsm_map_ms_PrepareSubsequentHO_Arg_U = -1;
 static gint ett_gsm_map_ms_PrepareSubsequentHO_Res_U = -1;
 static gint ett_gsm_map_ms_ProcessAccessSignalling_Arg_U = -1;
+static gint ett_gsm_map_ms_AoIPCodecsList = -1;
 static gint ett_gsm_map_ms_SupportedCodecsList = -1;
 static gint ett_gsm_map_ms_CodecList = -1;
 static gint ett_gsm_map_ms_SendEndSignal_Arg_U = -1;
@@ -1910,6 +1949,7 @@ static gint ett_gsm_map_ms_RequestedInfo = -1;
 static gint ett_gsm_map_ms_LocationInformation = -1;
 static gint ett_gsm_map_ms_LocationInformationEPS = -1;
 static gint ett_gsm_map_ms_LocationInformationGPRS = -1;
+static gint ett_gsm_map_ms_UserCSGInformation = -1;
 static gint ett_gsm_map_ms_SubscriberState = -1;
 static gint ett_gsm_map_ms_PS_SubscriberState = -1;
 static gint ett_gsm_map_ms_PDP_ContextInfoList = -1;
@@ -1926,6 +1966,7 @@ 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_CSG = -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;
@@ -2002,6 +2043,7 @@ static gint ett_gsm_map_lcs_ReportingPLMN = -1;
 static gint ett_gsm_map_lcs_ProvideSubscriberLocation_Res = -1;
 static gint ett_gsm_map_lcs_SubscriberLocationReport_Arg = -1;
 static gint ett_gsm_map_lcs_Deferredmt_lrData = -1;
+static gint ett_gsm_map_lcs_ServingNodeAddress = -1;
 static gint ett_gsm_map_lcs_SubscriberLocationReport_Res = -1;
 
 /* --- Module MAP-GR-DataTypes --- --- ---                                    */
@@ -2113,6 +2155,7 @@ static gint ett_gsm_ss_UserUserServiceArg = -1;
 static gint ett_gsm_ss_LocationNotificationArg = -1;
 static gint ett_gsm_ss_LocationNotificationRes = -1;
 static gint ett_gsm_ss_LCS_MOLRArg = -1;
+static gint ett_gsm_ss_MultiplePositioningProtocolPDUs = -1;
 static gint ett_gsm_ss_LCS_MOLRRes = -1;
 static gint ett_gsm_ss_LCS_AreaEventRequestArg = -1;
 static gint ett_gsm_ss_LCS_AreaEventReportArg = -1;
@@ -7428,6 +7471,8 @@ static const ber_sequence_t gsm_map_ms_SGSN_Capability_sequence[] = {
   { &hf_gsm_map_ms_smsCallBarringSupportIndicator, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &hf_gsm_map_ms_supportedRAT_TypesIndicator, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SupportedRAT_Types },
   { &hf_gsm_map_ms_supportedFeatures, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SupportedFeatures },
+  { &hf_gsm_map_ms_t_adsDataRetrieval, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
+  { &hf_gsm_map_ms_homogeneousSupportOfIMSVoiceOverPSSessions, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_BOOLEAN },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -7860,14 +7905,14 @@ dissect_gsm_map_ms_Codec(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 
 static const ber_sequence_t gsm_map_ms_CodecList_sequence[] = {
-  { &hf_gsm_map_ms_codec1   , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec2   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec3   , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec4   , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec5   , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec6   , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec7   , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
-  { &hf_gsm_map_ms_codec8   , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec1_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec2_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec3_01, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec4_01, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec5_01, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec6_01, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec7_01, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
+  { &hf_gsm_map_ms_codec8_01, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
   { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
   { NULL, 0, 0, 0, NULL }
 };
@@ -7897,6 +7942,38 @@ dissect_gsm_map_ms_SupportedCodecsList(gboolean implicit_tag _U_, tvbuff_t *tvb
 }
 
 
+
+static int
+dissect_gsm_map_ms_AoIPCodec(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_AoIPCodecsList_sequence[] = {
+  { &hf_gsm_map_ms_codec1   , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec2   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec3   , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec4   , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec5   , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec6   , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec7   , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_codec8   , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_gsm_map_ms_AoIPCodecsList(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_AoIPCodecsList_sequence, hf_index, ett_gsm_map_ms_AoIPCodecsList);
+
+  return offset;
+}
+
+
 static const ber_sequence_t gsm_map_ms_ForwardAccessSignalling_Arg_U_sequence[] = {
   { &hf_gsm_map_ms_an_APDU  , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_gsm_map_AccessNetworkSignalInfo },
   { &hf_gsm_map_ms_integrityProtectionInfo, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_IntegrityProtectionInformation },
@@ -7916,6 +7993,8 @@ static const ber_sequence_t gsm_map_ms_ForwardAccessSignalling_Arg_U_sequence[]
   { &hf_gsm_map_ms_iuSelectedCodec, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
   { &hf_gsm_map_ms_alternativeChannelType, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_RadioResourceInformation },
   { &hf_gsm_map_ms_tracePropagationList, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TracePropagationList },
+  { &hf_gsm_map_ms_aoipSupportedCodecsListAnchor, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodecsList },
+  { &hf_gsm_map_ms_aoipSelectedCodecTarget, BER_CLASS_CON, 19, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -8022,6 +8101,7 @@ static const ber_sequence_t gsm_map_ms_PrepareHO_Arg_U_sequence[] = {
   { &hf_gsm_map_ms_imeisv   , BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMEI },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -8164,6 +8244,8 @@ static const ber_sequence_t gsm_map_ms_PrepareHO_Res_U_sequence[] = {
   { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
   { &hf_gsm_map_ms_iuSelectedCodec, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
   { &hf_gsm_map_ms_iuAvailableCodecsList, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CodecList },
+  { &hf_gsm_map_ms_aoipSelectedCodecTarget, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_aoipAvailableCodecsListMap, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodecsList },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -8261,6 +8343,8 @@ static const ber_sequence_t gsm_map_ms_ProcessAccessSignalling_Arg_U_sequence[]
   { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
   { &hf_gsm_map_ms_iUSelectedCodec, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Codec },
   { &hf_gsm_map_ms_iuAvailableCodecsList, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CodecList },
+  { &hf_gsm_map_ms_aoipSelectedCodecTarget, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodec },
+  { &hf_gsm_map_ms_aoipAvailableCodecsListMap, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AoIPCodecsList },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -9890,6 +9974,16 @@ dissect_gsm_map_ms_APN_OI_Replacement(gboolean implicit_tag _U_, tvbuff_t *tvb _
 }
 
 
+
+static int
+dissect_gsm_map_ms_Ext_PDP_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);
+
+  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 },
@@ -9904,6 +9998,8 @@ static const ber_sequence_t gsm_map_ms_PDP_Context_sequence[] = {
   { &hf_gsm_map_ms_ext3_QoS_Subscribed, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext3_QoS_Subscribed },
   { &hf_gsm_map_ms_ext4_QoS_Subscribed, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext4_QoS_Subscribed },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11164,6 +11260,7 @@ dissect_gsm_map_ms_RestoreDataRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 static const value_string gsm_map_ms_DomainType_vals[] = {
   {   0, "cs-Domain" },
   {   1, "ps-Domain" },
+  {   2, "eps-Domain" },
   { 0, NULL }
 };
 
@@ -11186,6 +11283,7 @@ static const ber_sequence_t gsm_map_ms_RequestedInfo_sequence[] = {
   { &hf_gsm_map_ms_imei_01  , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &hf_gsm_map_ms_ms_classmark, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11270,6 +11368,10 @@ 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_6 },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11282,6 +11384,33 @@ dissect_gsm_map_ms_LocationInformationEPS(gboolean implicit_tag _U_, tvbuff_t *t
 }
 
 
+
+static int
+dissect_gsm_map_ms_OCTET_STRING_SIZE_1(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_UserCSGInformation_sequence[] = {
+  { &hf_gsm_map_ms_csg_Id   , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CSG_Id },
+  { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
+  { &hf_gsm_map_ms_accessMode, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OCTET_STRING_SIZE_1 },
+  { &hf_gsm_map_ms_cmi      , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OCTET_STRING_SIZE_1 },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_gsm_map_ms_UserCSGInformation(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_UserCSGInformation_sequence, hf_index, ett_gsm_map_ms_UserCSGInformation);
+
+  return offset;
+}
+
+
 static const ber_sequence_t gsm_map_ms_LocationInformation_sequence[] = {
   { &hf_gsm_map_ms_ageOfLocationInformation, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_AgeOfLocationInformation },
   { &hf_gsm_map_ms_geographicalInformation, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GeographicalInformation },
@@ -11295,6 +11424,7 @@ static const ber_sequence_t gsm_map_ms_LocationInformation_sequence[] = {
   { &hf_gsm_map_ms_currentLocationRetrieved, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &hf_gsm_map_ms_sai_Present, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &hf_gsm_map_ms_locationInformationEPS, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LocationInformationEPS },
+  { &hf_gsm_map_ms_userCSGInformation, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_UserCSGInformation },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11385,6 +11515,7 @@ static const ber_sequence_t gsm_map_ms_LocationInformationGPRS_sequence[] = {
   { &hf_gsm_map_ms_geodeticInformation, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GeodeticInformation },
   { &hf_gsm_map_ms_currentLocationRetrieved, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &hf_gsm_map_ms_ageOfLocationInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AgeOfLocationInformation },
+  { &hf_gsm_map_ms_userCSGInformation, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_UserCSGInformation },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11462,6 +11593,11 @@ static const ber_sequence_t gsm_map_ms_PDP_ContextInfo_sequence[] = {
   { &hf_gsm_map_ms_qos3_Subscribed, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext3_QoS_Subscribed },
   { &hf_gsm_map_ms_qos3_Requested, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext3_QoS_Subscribed },
   { &hf_gsm_map_ms_qos3_Negotiated, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext3_QoS_Subscribed },
+  { &hf_gsm_map_ms_qos4_Subscribed, BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext4_QoS_Subscribed },
+  { &hf_gsm_map_ms_qos4_Requested, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext4_QoS_Subscribed },
+  { &hf_gsm_map_ms_qos4_Negotiated, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext4_QoS_Subscribed },
+  { &hf_gsm_map_ms_ext_pdp_Type, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_PDP_Type },
+  { &hf_gsm_map_ms_ext_pdp_Address, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Address },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11488,7 +11624,7 @@ dissect_gsm_map_ms_PDP_ContextInfoList(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 
 static const value_string gsm_map_ms_PS_SubscriberState_vals[] = {
-  {   0, "notProvidedFromSGSN" },
+  {   0, "notProvidedFromSGSNorMME" },
   {   1, "ps-Detached" },
   {   2, "ps-AttachedNotReachableForPaging" },
   {   3, "ps-AttachedReachableForPaging" },
@@ -11499,7 +11635,7 @@ static const value_string gsm_map_ms_PS_SubscriberState_vals[] = {
 };
 
 static const ber_choice_t gsm_map_ms_PS_SubscriberState_choice[] = {
-  {   0, &hf_gsm_map_ms_notProvidedFromSGSN, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
+  {   0, &hf_gsm_map_ms_notProvidedFromSGSNorMME, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   {   1, &hf_gsm_map_ms_ps_Detached, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   {   2, &hf_gsm_map_ms_ps_AttachedNotReachableForPaging, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   {   3, &hf_gsm_map_ms_ps_AttachedReachableForPaging, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
@@ -11610,6 +11746,22 @@ 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" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_gsm_map_ms_IMS_VoiceOverPS_SessionsInd(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_SubscriberInfo_sequence[] = {
   { &hf_gsm_map_ms_locationInformation, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LocationInformation },
   { &hf_gsm_map_ms_subscriberState, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_ms_SubscriberState },
@@ -11620,6 +11772,11 @@ static const ber_sequence_t gsm_map_ms_SubscriberInfo_sequence[] = {
   { &hf_gsm_map_ms_ms_Classmark2, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_MS_Classmark2 },
   { &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_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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11730,6 +11887,7 @@ static const ber_sequence_t gsm_map_ms_RequestedSubscriptionInfo_sequence[] = {
   { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -11896,6 +12054,7 @@ static const ber_sequence_t gsm_map_ms_AnyTimeSubscriptionInterrogationRes_seque
   { &hf_gsm_map_ms_offeredCamel4CSIsInVLR, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OfferedCamel4CSIs },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -12029,6 +12188,21 @@ dissect_gsm_map_ms_ServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 }
 
 
+static const ber_sequence_t gsm_map_ms_ModificationRequestFor_CSG_sequence[] = {
+  { &hf_gsm_map_ms_modifyNotificationToCSE, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationInstruction },
+  { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_gsm_map_ms_ModificationRequestFor_CSG(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_CSG_sequence, hf_index, ett_gsm_map_ms_ModificationRequestFor_CSG);
+
+  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 },
@@ -12040,6 +12214,7 @@ static const ber_sequence_t gsm_map_ms_AnyTimeModificationArg_sequence[] = {
   { &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_modificationRequestFor_CSG, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_CSG },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -12137,6 +12312,7 @@ static const ber_sequence_t gsm_map_ms_NoteSubscriberDataModifiedArg_sequence[]
   { &hf_gsm_map_ms_allInformationSent, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL },
   { &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 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -12569,6 +12745,7 @@ static const ber_sequence_t gsm_map_ch_SendRoutingInfoRes_U_sequence[] = {
   { &hf_gsm_map_ch_unavailabilityCause, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ch_UnavailabilityCause },
   { &hf_gsm_map_ch_releaseResourcesSupported, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ch_NULL },
   { &hf_gsm_map_ch_gsm_BearerCapability, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExternalSignalInfo },
+  { &hf_gsm_map_ch_mtRoamingRetryIndicator, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ch_NULL },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -13071,6 +13248,16 @@ dissect_gsm_map_lcs_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 }
 
 
+
+static int
+dissect_gsm_map_lcs_DiameterIdentity(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_lcs_LCSLocationInfo_sequence[] = {
   { &hf_gsm_map_lcs_networkNode_Number, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString },
   { &hf_gsm_map_lcs_lmsi    , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_LMSI },
@@ -13079,6 +13266,8 @@ static const ber_sequence_t gsm_map_lcs_LCSLocationInfo_sequence[] = {
   { &hf_gsm_map_lcs_additional_Number, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_Additional_Number },
   { &hf_gsm_map_lcs_supportedLCS_CapabilitySets, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SupportedLCS_CapabilitySets },
   { &hf_gsm_map_lcs_additional_LCS_CapabilitySets, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SupportedLCS_CapabilitySets },
+  { &hf_gsm_map_lcs_mme_Name, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_DiameterIdentity },
+  { &hf_gsm_map_lcs_aaa_Server_Name, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_DiameterIdentity },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -13762,6 +13951,30 @@ dissect_gsm_map_lcs_VelocityEstimate(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 }
 
 
+static const value_string gsm_map_lcs_ServingNodeAddress_vals[] = {
+  {   0, "msc-Number" },
+  {   1, "sgsn-Number" },
+  {   2, "mme-Number" },
+  { 0, NULL }
+};
+
+static const ber_choice_t gsm_map_lcs_ServingNodeAddress_choice[] = {
+  {   0, &hf_gsm_map_lcs_msc_Number, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString },
+  {   1, &hf_gsm_map_lcs_sgsn_Number, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString },
+  {   2, &hf_gsm_map_lcs_mme_Number, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_DiameterIdentity },
+  { 0, NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_gsm_map_lcs_ServingNodeAddress(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,
+                                 gsm_map_lcs_ServingNodeAddress_choice, hf_index, ett_gsm_map_lcs_ServingNodeAddress,
+                                 NULL);
+
+  return offset;
+}
+
+
 static const ber_sequence_t gsm_map_lcs_ProvideSubscriberLocation_Res_sequence[] = {
   { &hf_gsm_map_lcs_locationEstimate, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_lcs_Ext_GeographicalInformation },
   { &hf_gsm_map_lcs_ageOfLocationEstimate, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AgeOfLocationInformation },
@@ -13775,6 +13988,7 @@ static const ber_sequence_t gsm_map_lcs_ProvideSubscriberLocation_Res_sequence[]
   { &hf_gsm_map_lcs_accuracyFulfilmentIndicator, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_AccuracyFulfilmentIndicator },
   { &hf_gsm_map_lcs_velocityEstimate, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_VelocityEstimate },
   { &hf_gsm_map_lcs_mo_lrShortCircuitIndicator, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_NULL },
+  { &hf_gsm_map_lcs_targetServingNodeForHandover, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_lcs_ServingNodeAddress },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -13793,6 +14007,7 @@ static const value_string gsm_map_lcs_LCS_Event_vals[] = {
   {   2, "mo-lr" },
   {   3, "deferredmt-lrResponse" },
   {   4, "deferredmo-lrTTTPInitiation" },
+  {   5, "emergencyCallHandover" },
   { 0, NULL }
 };
 
@@ -13883,6 +14098,7 @@ static const ber_sequence_t gsm_map_lcs_SubscriberLocationReport_Arg_sequence[]
   { &hf_gsm_map_lcs_sequenceNumber, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_SequenceNumber },
   { &hf_gsm_map_lcs_periodicLDRInfo, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_PeriodicLDRInfo },
   { &hf_gsm_map_lcs_mo_lrShortCircuitIndicator, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_NULL },
+  { &hf_gsm_map_lcs_targetServingNodeForHandover, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_lcs_ServingNodeAddress },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -14000,6 +14216,7 @@ static const ber_sequence_t gsm_map_gr_PrepareGroupCallArg_sequence[] = {
   { &hf_gsm_map_gr_vstk     , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_gr_VSTK },
   { &hf_gsm_map_gr_vstk_rand, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_gr_VSTK_RAND },
   { &hf_gsm_map_gr_talkerChannelParameter, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_gr_NULL },
+  { &hf_gsm_map_gr_uplinkReplyIndicator, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_gr_NULL },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -16311,6 +16528,29 @@ dissect_gsm_ss_GANSSAssistanceData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 }
 
 
+
+static int
+dissect_gsm_ss_PositioningProtocolPDU(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_ss_MultiplePositioningProtocolPDUs_sequence_of[1] = {
+  { &hf_gsm_ss_MultiplePositioningProtocolPDUs_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_ss_PositioningProtocolPDU },
+};
+
+static int
+dissect_gsm_ss_MultiplePositioningProtocolPDUs(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_ss_MultiplePositioningProtocolPDUs_sequence_of, hf_index, ett_gsm_ss_MultiplePositioningProtocolPDUs);
+
+  return offset;
+}
+
+
 static const ber_sequence_t gsm_ss_LCS_MOLRArg_sequence[] = {
   { &hf_gsm_ss_molr_Type    , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_ss_MOLR_Type },
   { &hf_gsm_ss_locationMethod, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_LocationMethod },
@@ -16333,6 +16573,7 @@ static const ber_sequence_t gsm_ss_LCS_MOLRArg_sequence[] = {
   { &hf_gsm_ss_terminationCause, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_TerminationCause },
   { &hf_gsm_ss_mo_lrShortCircuit, BER_CLASS_CON, 19, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_NULL },
   { &hf_gsm_ss_ganssAssistanceData, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_GANSSAssistanceData },
+  { &hf_gsm_ss_multiplePositioningProtocolPDUs, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_MultiplePositioningProtocolPDUs },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -20114,6 +20355,14 @@ void proto_register_gsm_map(void) {
       { "supportedFeatures", "gsm_map.ms.supportedFeatures",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedFeatures", HFILL }},
+    { &hf_gsm_map_ms_t_adsDataRetrieval,
+      { "t-adsDataRetrieval", "gsm_map.ms.t_adsDataRetrieval",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.NULL", HFILL }},
+    { &hf_gsm_map_ms_homogeneousSupportOfIMSVoiceOverPSSessions,
+      { "homogeneousSupportOfIMSVoiceOverPSSessions", "gsm_map.ms.homogeneousSupportOfIMSVoiceOverPSSessions",
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        "gsm_map_ms.BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_sgsn_mmeSeparationSupported,
       { "sgsn-mmeSeparationSupported", "gsm_map.ms.sgsn_mmeSeparationSupported",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -20186,6 +20435,14 @@ void proto_register_gsm_map(void) {
       { "tracePropagationList", "gsm_map.ms.tracePropagationList",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_om.TracePropagationList", HFILL }},
+    { &hf_gsm_map_ms_aoipSupportedCodecsListAnchor,
+      { "aoipSupportedCodecsListAnchor", "gsm_map.ms.aoipSupportedCodecsListAnchor",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodecsList", HFILL }},
+    { &hf_gsm_map_ms_aoipSelectedCodecTarget,
+      { "aoipSelectedCodecTarget", "gsm_map.ms.aoipSelectedCodecTarget",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionAlgorithms,
       { "integrityProtectionAlgorithms", "gsm_map.ms.integrityProtectionAlgorithms",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -20266,6 +20523,10 @@ void proto_register_gsm_map(void) {
       { "iuAvailableCodecsList", "gsm_map.ms.iuAvailableCodecsList",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.CodecList", HFILL }},
+    { &hf_gsm_map_ms_aoipAvailableCodecsListMap,
+      { "aoipAvailableCodecsListMap", "gsm_map.ms.aoipAvailableCodecsListMap",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodecsList", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionAlgorithm,
       { "integrityProtectionAlgorithm", "gsm_map.ms.integrityProtectionAlgorithm",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -20298,6 +20559,38 @@ void proto_register_gsm_map(void) {
       { "iUSelectedCodec", "gsm_map.ms.iUSelectedCodec",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
+    { &hf_gsm_map_ms_codec1,
+      { "codec1", "gsm_map.ms.codec1",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec2,
+      { "codec2", "gsm_map.ms.codec2",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec3,
+      { "codec3", "gsm_map.ms.codec3",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec4,
+      { "codec4", "gsm_map.ms.codec4",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec5,
+      { "codec5", "gsm_map.ms.codec5",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec6,
+      { "codec6", "gsm_map.ms.codec6",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec7,
+      { "codec7", "gsm_map.ms.codec7",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
+    { &hf_gsm_map_ms_codec8,
+      { "codec8", "gsm_map.ms.codec8",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.AoIPCodec", HFILL }},
     { &hf_gsm_map_ms_utranCodecList,
       { "utranCodecList", "gsm_map.ms.utranCodecList",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -20306,35 +20599,35 @@ void proto_register_gsm_map(void) {
       { "geranCodecList", "gsm_map.ms.geranCodecList",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.CodecList", HFILL }},
-    { &hf_gsm_map_ms_codec1,
+    { &hf_gsm_map_ms_codec1_01,
       { "codec1", "gsm_map.ms.codec1",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec2,
+    { &hf_gsm_map_ms_codec2_01,
       { "codec2", "gsm_map.ms.codec2",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec3,
+    { &hf_gsm_map_ms_codec3_01,
       { "codec3", "gsm_map.ms.codec3",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec4,
+    { &hf_gsm_map_ms_codec4_01,
       { "codec4", "gsm_map.ms.codec4",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec5,
+    { &hf_gsm_map_ms_codec5_01,
       { "codec5", "gsm_map.ms.codec5",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec6,
+    { &hf_gsm_map_ms_codec6_01,
       { "codec6", "gsm_map.ms.codec6",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec7,
+    { &hf_gsm_map_ms_codec7_01,
       { "codec7", "gsm_map.ms.codec7",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
-    { &hf_gsm_map_ms_codec8,
+    { &hf_gsm_map_ms_codec8_01,
       { "codec8", "gsm_map.ms.codec8",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
@@ -20590,6 +20883,14 @@ void proto_register_gsm_map(void) {
       { "ext4-QoS-Subscribed", "gsm_map.ms.ext4_QoS_Subscribed",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext4_QoS_Subscribed", HFILL }},
+    { &hf_gsm_map_ms_ext_pdp_Type,
+      { "ext-pdp-Type", "gsm_map.ms.ext_pdp_Type",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.Ext_PDP_Type", HFILL }},
+    { &hf_gsm_map_ms_ext_pdp_Address,
+      { "ext-pdp-Address", "gsm_map.ms.ext_pdp_Address",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.PDP_Address", HFILL }},
     { &hf_gsm_map_ms_gprsDataList,
       { "gprsDataList", "gsm_map.ms.gprsDataList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -21302,6 +21603,26 @@ void proto_register_gsm_map(void) {
       { "mnpInfoRes", "gsm_map.ms.mnpInfoRes",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.MNPInfoRes", HFILL }},
+    { &hf_gsm_map_ms_imsVoiceOverPS_SessionsIndication,
+      { "imsVoiceOverPS-SessionsIndication", "gsm_map.ms.imsVoiceOverPS_SessionsIndication",
+        FT_UINT32, BASE_DEC, VALS(gsm_map_ms_IMS_VoiceOverPS_SessionsInd_vals), 0,
+        "gsm_map_ms.IMS_VoiceOverPS_SessionsInd", HFILL }},
+    { &hf_gsm_map_ms_lastUE_ActivityTime,
+      { "lastUE-ActivityTime", "gsm_map.ms.lastUE_ActivityTime",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.Time", HFILL }},
+    { &hf_gsm_map_ms_lastRAT_Type,
+      { "lastRAT-Type", "gsm_map.ms.lastRAT_Type",
+        FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Used_RAT_Type_vals), 0,
+        "gsm_map_ms.Used_RAT_Type", HFILL }},
+    { &hf_gsm_map_ms_eps_SubscriberState,
+      { "eps-SubscriberState", "gsm_map.ms.eps_SubscriberState",
+        FT_UINT32, BASE_DEC, VALS(gsm_map_ms_PS_SubscriberState_vals), 0,
+        "gsm_map_ms.PS_SubscriberState", HFILL }},
+    { &hf_gsm_map_ms_locationInformationEPS,
+      { "locationInformationEPS", "gsm_map.ms.locationInformationEPS",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.LocationInformationEPS", HFILL }},
     { &hf_gsm_map_ms_routeingNumber,
       { "routeingNumber", "gsm_map.ms.routeingNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -21346,6 +21667,10 @@ void proto_register_gsm_map(void) {
       { "mnpRequestedInfo", "gsm_map.ms.mnpRequestedInfo",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
+    { &hf_gsm_map_ms_t_adsData,
+      { "t-adsData", "gsm_map.ms.t_adsData",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_ageOfLocationInformation,
       { "ageOfLocationInformation", "gsm_map.ms.ageOfLocationInformation",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -21382,10 +21707,10 @@ void proto_register_gsm_map(void) {
       { "sai-Present", "gsm_map.ms.sai_Present",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
-    { &hf_gsm_map_ms_locationInformationEPS,
-      { "locationInformationEPS", "gsm_map.ms.locationInformationEPS",
+    { &hf_gsm_map_ms_userCSGInformation,
+      { "userCSGInformation", "gsm_map.ms.userCSGInformation",
         FT_NONE, BASE_NONE, NULL, 0,
-        "gsm_map_ms.LocationInformationEPS", HFILL }},
+        "gsm_map_ms.UserCSGInformation", HFILL }},
     { &hf_gsm_map_ms_e_utranCellGlobalIdentity,
       { "e-utranCellGlobalIdentity", "gsm_map.ms.e_utranCellGlobalIdentity",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -21402,6 +21727,14 @@ void proto_register_gsm_map(void) {
       { "selectedLSAIdentity", "gsm_map.ms.selectedLSAIdentity",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
+    { &hf_gsm_map_ms_accessMode,
+      { "accessMode", "gsm_map.ms.accessMode",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.OCTET_STRING_SIZE_1", HFILL }},
+    { &hf_gsm_map_ms_cmi,
+      { "cmi", "gsm_map.ms.cmi",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_gsm_map_ms_assumedIdle,
       { "assumedIdle", "gsm_map.ms.assumedIdle",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -21418,8 +21751,8 @@ void proto_register_gsm_map(void) {
       { "notProvidedFromVLR", "gsm_map.ms.notProvidedFromVLR",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
-    { &hf_gsm_map_ms_notProvidedFromSGSN,
-      { "notProvidedFromSGSN", "gsm_map.ms.notProvidedFromSGSN",
+    { &hf_gsm_map_ms_notProvidedFromSGSNorMME,
+      { "notProvidedFromSGSNorMME", "gsm_map.ms.notProvidedFromSGSNorMME",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_ps_Detached,
@@ -21522,6 +21855,18 @@ void proto_register_gsm_map(void) {
       { "qos3-Negotiated", "gsm_map.ms.qos3_Negotiated",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext3_QoS_Subscribed", HFILL }},
+    { &hf_gsm_map_ms_qos4_Subscribed,
+      { "qos4-Subscribed", "gsm_map.ms.qos4_Subscribed",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.Ext4_QoS_Subscribed", HFILL }},
+    { &hf_gsm_map_ms_qos4_Requested,
+      { "qos4-Requested", "gsm_map.ms.qos4_Requested",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.Ext4_QoS_Subscribed", HFILL }},
+    { &hf_gsm_map_ms_qos4_Negotiated,
+      { "qos4-Negotiated", "gsm_map.ms.qos4_Negotiated",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_ms.Ext4_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_subscriberIdentity,
       { "subscriberIdentity", "gsm_map.ms.subscriberIdentity",
         FT_UINT32, BASE_DEC, VALS(gsm_map_SubscriberIdentity_vals), 0,
@@ -21566,6 +21911,10 @@ void proto_register_gsm_map(void) {
       { "msisdn-BS-List", "gsm_map.ms.msisdn_BS_List",
         FT_UINT32, BASE_DEC, NULL, 0,
         "gsm_map_ms.MSISDN_BS_List", HFILL }},
+    { &hf_gsm_map_ms_csg_SubscriptionDataList,
+      { "csg-SubscriptionDataList", "gsm_map.ms.csg_SubscriptionDataList",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "gsm_map_ms.CSG_SubscriptionDataList", HFILL }},
     { &hf_gsm_map_ms_requestedSS_Info,
       { "requestedSS-Info", "gsm_map.ms.requestedSS_Info",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -21594,6 +21943,10 @@ void proto_register_gsm_map(void) {
       { "msisdn-BS-List", "gsm_map.ms.msisdn_BS_List",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.NULL", HFILL }},
+    { &hf_gsm_map_ms_csg_SubscriptionDataRequested,
+      { "csg-SubscriptionDataRequested", "gsm_map.ms.csg_SubscriptionDataRequested",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_MSISDN_BS_List_item,
       { "MSISDN-BS", "gsm_map.ms.MSISDN_BS",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -21666,6 +22019,14 @@ void proto_register_gsm_map(void) {
       { "activationRequestForUE-reachability", "gsm_map.ms.activationRequestForUE_reachability",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ServingNode", HFILL }},
+    { &hf_gsm_map_ms_modificationRequestFor_CSG,
+      { "modificationRequestFor-CSG", "gsm_map.ms.modificationRequestFor_CSG",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ms.ModificationRequestFor_CSG", HFILL }},
+    { &hf_gsm_map_ms_modifyNotificationToCSE,
+      { "modifyNotificationToCSE", "gsm_map.ms.modifyNotificationToCSE",
+        FT_UINT32, BASE_DEC, VALS(gsm_map_ms_ModificationInstruction_vals), 0,
+        "gsm_map_ms.ModificationInstruction", HFILL }},
     { &hf_gsm_map_ms_ss_InfoFor_CSE,
       { "ss-InfoFor-CSE", "gsm_map.ms.ss_InfoFor_CSE",
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_Ext_SS_InfoFor_CSE_vals), 0,
@@ -21674,10 +22035,6 @@ void proto_register_gsm_map(void) {
       { "forwardedToNumber", "gsm_map.ms.forwardedToNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
-    { &hf_gsm_map_ms_modifyNotificationToCSE,
-      { "modifyNotificationToCSE", "gsm_map.ms.modifyNotificationToCSE",
-        FT_UINT32, BASE_DEC, VALS(gsm_map_ms_ModificationInstruction_vals), 0,
-        "gsm_map_ms.ModificationInstruction", HFILL }},
     { &hf_gsm_map_ms_odb_data,
       { "odb-data", "gsm_map.ms.odb_data",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -21782,10 +22139,6 @@ void proto_register_gsm_map(void) {
       { "eps-SubscriptionData", "gsm_map.ms.eps_SubscriptionData",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_ms.EPS_SubscriptionData", HFILL }},
-    { &hf_gsm_map_ms_csg_SubscriptionDataList,
-      { "csg-SubscriptionDataList", "gsm_map.ms.csg_SubscriptionDataList",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "gsm_map_ms.CSG_SubscriptionDataList", HFILL }},
     { &hf_gsm_map_ms_ue_ReachabilityRequestIndicator,
       { "ue-ReachabilityRequestIndicator", "gsm_map.ms.ue_ReachabilityRequestIndicator",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -22521,6 +22874,10 @@ void proto_register_gsm_map(void) {
       { "gsm-BearerCapability", "gsm_map.ch.gsm_BearerCapability",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map.ExternalSignalInfo", HFILL }},
+    { &hf_gsm_map_ch_mtRoamingRetryIndicator,
+      { "mtRoamingRetryIndicator", "gsm_map.ch.mtRoamingRetryIndicator",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_ccbs_Possible,
       { "ccbs-Possible", "gsm_map.ch.ccbs_Possible",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -22788,6 +23145,14 @@ void proto_register_gsm_map(void) {
       { "additional-LCS-CapabilitySets", "gsm_map.lcs.additional_LCS_CapabilitySets",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedLCS_CapabilitySets", HFILL }},
+    { &hf_gsm_map_lcs_mme_Name,
+      { "mme-Name", "gsm_map.lcs.mme_Name",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_lcs.DiameterIdentity", HFILL }},
+    { &hf_gsm_map_lcs_aaa_Server_Name,
+      { "aaa-Server-Name", "gsm_map.lcs.aaa_Server_Name",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_lcs.DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_locationType,
       { "locationType", "gsm_map.lcs.locationType",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -23048,6 +23413,10 @@ void proto_register_gsm_map(void) {
       { "velocityEstimate", "gsm_map.lcs.velocityEstimate",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.VelocityEstimate", HFILL }},
+    { &hf_gsm_map_lcs_targetServingNodeForHandover,
+      { "targetServingNodeForHandover", "gsm_map.lcs.targetServingNodeForHandover",
+        FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_ServingNodeAddress_vals), 0,
+        "gsm_map_lcs.ServingNodeAddress", HFILL }},
     { &hf_gsm_map_lcs_lcs_Event,
       { "lcs-Event", "gsm_map.lcs.lcs_Event",
         FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_LCS_Event_vals), 0,
@@ -23080,6 +23449,18 @@ void proto_register_gsm_map(void) {
       { "terminationCause", "gsm_map.lcs.terminationCause",
         FT_UINT32, BASE_DEC, VALS(gsm_map_lcs_TerminationCause_vals), 0,
         "gsm_map_lcs.TerminationCause", HFILL }},
+    { &hf_gsm_map_lcs_msc_Number,
+      { "msc-Number", "gsm_map.lcs.msc_Number",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map.ISDN_AddressString", HFILL }},
+    { &hf_gsm_map_lcs_sgsn_Number,
+      { "sgsn-Number", "gsm_map.lcs.sgsn_Number",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map.ISDN_AddressString", HFILL }},
+    { &hf_gsm_map_lcs_mme_Number,
+      { "mme-Number", "gsm_map.lcs.mme_Number",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_map_lcs.DiameterIdentity", HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable,
       { "msAvailable", "gsm_map.lcs.msAvailable",
         FT_BOOLEAN, 8, NULL, 0x80,
@@ -23179,6 +23560,10 @@ void proto_register_gsm_map(void) {
       { "talkerChannelParameter", "gsm_map.gr.talkerChannelParameter",
         FT_NONE, BASE_NONE, NULL, 0,
         "gsm_map_gr.NULL", HFILL }},
+    { &hf_gsm_map_gr_uplinkReplyIndicator,
+      { "uplinkReplyIndicator", "gsm_map.gr.uplinkReplyIndicator",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "gsm_map_gr.NULL", HFILL }},
     { &hf_gsm_map_gr_groupCallNumber,
       { "groupCallNumber", "gsm_map.gr.groupCallNumber",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -23952,6 +24337,14 @@ void proto_register_gsm_map(void) {
       { "ganssAssistanceData", "gsm_ss.ganssAssistanceData",
         FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_ss.GANSSAssistanceData", HFILL }},
+    { &hf_gsm_ss_multiplePositioningProtocolPDUs,
+      { "multiplePositioningProtocolPDUs", "gsm_ss.multiplePositioningProtocolPDUs",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "gsm_ss.MultiplePositioningProtocolPDUs", HFILL }},
+    { &hf_gsm_ss_MultiplePositioningProtocolPDUs_item,
+      { "PositioningProtocolPDU", "gsm_ss.PositioningProtocolPDU",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "gsm_ss.PositioningProtocolPDU", HFILL }},
     { &hf_gsm_ss_decipheringKeys,
       { "decipheringKeys", "gsm_ss.decipheringKeys",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -24218,6 +24611,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_ms_PrepareSubsequentHO_Arg_U,
     &ett_gsm_map_ms_PrepareSubsequentHO_Res_U,
     &ett_gsm_map_ms_ProcessAccessSignalling_Arg_U,
+    &ett_gsm_map_ms_AoIPCodecsList,
     &ett_gsm_map_ms_SupportedCodecsList,
     &ett_gsm_map_ms_CodecList,
     &ett_gsm_map_ms_SendEndSignal_Arg_U,
@@ -24359,6 +24753,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_ms_LocationInformation,
     &ett_gsm_map_ms_LocationInformationEPS,
     &ett_gsm_map_ms_LocationInformationGPRS,
+    &ett_gsm_map_ms_UserCSGInformation,
     &ett_gsm_map_ms_SubscriberState,
     &ett_gsm_map_ms_PS_SubscriberState,
     &ett_gsm_map_ms_PDP_ContextInfoList,
@@ -24375,6 +24770,7 @@ 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_CSG,
     &ett_gsm_map_ms_ServingNode,
     &ett_gsm_map_ms_AnyTimeModificationRes,
     &ett_gsm_map_ms_ModificationRequestFor_CF_Info,
@@ -24451,6 +24847,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_lcs_ProvideSubscriberLocation_Res,
     &ett_gsm_map_lcs_SubscriberLocationReport_Arg,
     &ett_gsm_map_lcs_Deferredmt_lrData,
+    &ett_gsm_map_lcs_ServingNodeAddress,
     &ett_gsm_map_lcs_SubscriberLocationReport_Res,
 
 /* --- Module MAP-GR-DataTypes --- --- ---                                    */
@@ -24562,6 +24959,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_ss_LocationNotificationArg,
     &ett_gsm_ss_LocationNotificationRes,
     &ett_gsm_ss_LCS_MOLRArg,
+    &ett_gsm_ss_MultiplePositioningProtocolPDUs,
     &ett_gsm_ss_LCS_MOLRRes,
     &ett_gsm_ss_LCS_AreaEventRequestArg,
     &ett_gsm_ss_LCS_AreaEventReportArg,