diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-01 22:29:28 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-01 22:29:28 +0000 |
| commit | 9cca1aca97abe7778b7d61b8db41605ad8871656 (patch) | |
| tree | 5862829e8ba6756d00a42d52e25a6220b93713e4 | |
| parent | f43896700fc7678fb6f728fd944a094c3d0f4a90 (diff) | |
Update to V9.0.0 (2009-12)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31404 f5534014-38df-0310-8fa8-9805f1628bb7
34 files changed, 1088 insertions, 260 deletions
diff --git a/asn1/camel/CAP-datatypes.asn b/asn1/camel/CAP-datatypes.asn index 932888cca4..8760a300ac 100644 --- a/asn1/camel/CAP-datatypes.asn +++ b/asn1/camel/CAP-datatypes.asn @@ -28,6 +28,7 @@ cs2(20) modules(0) in-cs2-datatypes(0) version1(0)} IMSI, ISDN-AddressString, LAIFixedLength, + GSN-Address, -- WS moved to common datatypes in rel 9.0.0 NAEA-CIC FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} @@ -35,7 +36,6 @@ gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} Ext-QoS-Subscribed, Ext2-QoS-Subscribed, GeographicalInformation, - GSN-Address, LocationInformation, LSAIdentity, QoS-Subscribed, diff --git a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn index a6cbfd84f8..43bef51f5f 100644 --- a/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn +++ b/asn1/camel/CAP-gprsSSF-gsmSCF-ops-args.asn @@ -38,13 +38,13 @@ cs2(20) modules(0) in-cs2-datatypes (0) version1(0)} IMEI, IMSI, + GSN-Address, -- WS moved to common datatypes in rel 9.0.0 ISDN-AddressString FROM MAP-CommonDataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) modules(3) map-CommonDataTypes(18) version9(9)} GPRSChargingID, GPRSMSClass, - GSN-Address, RAIdentity FROM MAP-MS-DataTypes {itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) modules(3) map-MS-DataTypes(11) version9(9)} diff --git a/asn1/gsm_map/GSMMAP.asn b/asn1/gsm_map/GSMMAP.asn index d20c794b3c..59918e00c4 100644 --- a/asn1/gsm_map/GSMMAP.asn +++ b/asn1/gsm_map/GSMMAP.asn @@ -607,6 +607,11 @@ SendRoutingInfoResV2 ::= SEQUENCE { -- cug-CheckInfo must be absent in version 1 ... } - +-- Removed from SS-DataTypes.asn in Rel 9.0.0 +BeginSubscriberActivityArg ::= SEQUENCE { + imsi IMSI, + originatingEntityNumber ISDN-AddressString, + msisdn [PRIVATE 28] AddressString OPTIONAL, + ... } END diff --git a/asn1/gsm_map/MAP-ApplicationContexts.asn b/asn1/gsm_map/MAP-ApplicationContexts.asn index 49b7a3c920..dc0aa8d772 100644 --- a/asn1/gsm_map/MAP-ApplicationContexts.asn +++ b/asn1/gsm_map/MAP-ApplicationContexts.asn @@ -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 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) MAP-ApplicationContexts { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-ApplicationContexts (2) version11 (11)} @@ -195,3 +195,4 @@ resourceManagementContext-v3 OBJECT IDENTIFIER ::= END + diff --git a/asn1/gsm_map/MAP-BS-Code.asn b/asn1/gsm_map/MAP-BS-Code.asn index 933b3c6696..e589c4e344 100644 --- a/asn1/gsm_map/MAP-BS-Code.asn +++ b/asn1/gsm_map/MAP-BS-Code.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.10 Bearer Service Codes MAP-BS-Code { diff --git a/asn1/gsm_map/MAP-CH-DataTypes.asn b/asn1/gsm_map/MAP-CH-DataTypes.asn index df14fb8025..e5e0db426c 100644 --- a/asn1/gsm_map/MAP-CH-DataTypes.asn +++ b/asn1/gsm_map/MAP-CH-DataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.3 Call handling data types MAP-CH-DataTypes { @@ -37,7 +37,7 @@ IST-CommandRes, UU-Data, ReleaseResourcesArg, ReleaseResourcesRes, ---- WS added exports needed by gsm_map.asn (extra asn1 file to handle older proto. ver.) +-- WS added exports needed by gsm_map.asn (extra asn1 file to handle older proto. ver.) RoutingInfo, CUG-CheckInfo ; @@ -473,4 +473,3 @@ ReleaseResourcesRes ::= SEQUENCE{ END - diff --git a/asn1/gsm_map/MAP-CallHandlingOperations.asn b/asn1/gsm_map/MAP-CallHandlingOperations.asn index 1d21a0a57b..91c982af0a 100644 --- a/asn1/gsm_map/MAP-CallHandlingOperations.asn +++ b/asn1/gsm_map/MAP-CallHandlingOperations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) --17.6.3 Call Handling Operations MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) @@ -213,4 +213,3 @@ releaseResources OPERATION::= { --Timer m CODE local:20 } END - diff --git a/asn1/gsm_map/MAP-CommonDataTypes.asn b/asn1/gsm_map/MAP-CommonDataTypes.asn index 82b13de08f..a964c9c30a 100644 --- a/asn1/gsm_map/MAP-CommonDataTypes.asn +++ b/asn1/gsm_map/MAP-CommonDataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.8 Common data types MAP-CommonDataTypes { @@ -67,9 +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, - LCSServiceTypeID + -- gprs location registration types + GSN-Address + ; IMPORTS @@ -302,6 +304,9 @@ alertingCategory-5 AlertingPattern ::= '00001000'B -- all other values of Alerting Category are reserved -- Alerting categories are defined in GSM 02.07 +GSN-Address ::= OCTET STRING (SIZE (5..17)) + -- Octets are coded according to TS 3GPP TS 23.003 [17] + -- data types for numbering and identification IMSI ::= TBCD-STRING (SIZE (3..8)) @@ -389,9 +394,9 @@ NAEA-PreferredCI ::= SEQUENCE { NAEA-CIC ::= OCTET STRING (SIZE (3)) -- The internal structure is defined by the Carrier Identification - -- parameter in ANSI T1.113.3. Carrier codes between "000" and "999" may - -- be encoded as 3 digits using "000" to "999" or as 4 digits using - -- "0000" to "0999". Carrier codes between "1000" and "9999" are encoded + -- parameter in ANSI T1.113.3. Carrier codes between “000” and “999” may + -- be encoded as 3 digits using “000” to “999” or as 4 digits using + -- “0000” to “0999”. Carrier codes between “1000” and “9999” are encoded -- using 4 digits. SubscriberIdentity ::= CHOICE { @@ -624,10 +629,9 @@ AgeOfLocationInformation ::= INTEGER (0..32767) -- the value represents the elapsed time in minutes since the last -- network contact of the mobile station (i.e. the actuality of the -- location information). --- value "0" indicates that the MS is currently in contact with the +-- value “0” indicates that the MS is currently in contact with the -- network --- value "32767" indicates that the location information is at least +-- value “32767” indicates that the location information is at least -- 32767 minutes old END - diff --git a/asn1/gsm_map/MAP-DialogueInformation.asn b/asn1/gsm_map/MAP-DialogueInformation.asn index fd66160908..2c6ff94948 100644 --- a/asn1/gsm_map/MAP-DialogueInformation.asn +++ b/asn1/gsm_map/MAP-DialogueInformation.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.4 MAP Dialogue Information MAP-DialogueInformation { @@ -126,5 +126,3 @@ MAP-ProviderAbortReason ::= ENUMERATED { invalidPDU (1)} END - - diff --git a/asn1/gsm_map/MAP-ER-DataTypes.asn b/asn1/gsm_map/MAP-ER-DataTypes.asn index 30ebabeb24..be34c073a9 100644 --- a/asn1/gsm_map/MAP-ER-DataTypes.asn +++ b/asn1/gsm_map/MAP-ER-DataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.7 Error data types MAP-ER-DataTypes { @@ -412,4 +412,3 @@ OngoingGroupCallParam ::= SEQUENCE { END - diff --git a/asn1/gsm_map/MAP-Errors.asn b/asn1/gsm_map/MAP-Errors.asn index ac454f926b..d9daace1b9 100644 --- a/asn1/gsm_map/MAP-Errors.asn +++ b/asn1/gsm_map/MAP-Errors.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.6.6 Errors MAP-Errors { @@ -507,4 +507,3 @@ mm-EventNotSupported ERROR ::= { END - diff --git a/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/asn1/gsm_map/MAP-ExtensionDataTypes.asn index e815286519..0b86325956 100644 --- a/asn1/gsm_map/MAP-ExtensionDataTypes.asn +++ b/asn1/gsm_map/MAP-ExtensionDataTypes.asn @@ -1,7 +1,7 @@ -- $Id$ -- MAP-ExtensionDataTypes.asn -- --- Taken from 3GPP TS 29.002 V8.9.0 (2009-04) +-- Taken from 3GPP TS 29.002 V9.0.0 (2009-12) -- -- 17.7.11 Extension data types -- @@ -71,4 +71,3 @@ SLR-Arg-PCS-Extensions ::= SEQUENCE { na-ESRK-Request [0] NULL OPTIONAL } END - diff --git a/asn1/gsm_map/MAP-GR-DataTypes.asn b/asn1/gsm_map/MAP-GR-DataTypes.asn index 486dd4545e..a3fa6ac596 100644 --- a/asn1/gsm_map/MAP-GR-DataTypes.asn +++ b/asn1/gsm_map/MAP-GR-DataTypes.asn @@ -1,6 +1,6 @@ -- $Id$ -- --- Taken from 3GPP TS 29.002 V8.9.0 (2009-04) +-- Taken from 3GPP TS 29.002 V9.0.0 (2009-12) -- --17.7.12 Group Call data types @@ -196,4 +196,3 @@ SendGroupCallInfoRes ::= SEQUENCE { END - diff --git a/asn1/gsm_map/MAP-Group-Call-Operations.asn b/asn1/gsm_map/MAP-Group-Call-Operations.asn index b14657f73d..bad0217512 100644 --- a/asn1/gsm_map/MAP-Group-Call-Operations.asn +++ b/asn1/gsm_map/MAP-Group-Call-Operations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.6.7 Group Call operations MAP-Group-Call-Operations { @@ -96,4 +96,3 @@ sendGroupCallInfo OPERATION ::= { --Timer m END - diff --git a/asn1/gsm_map/MAP-LCS-DataTypes.asn b/asn1/gsm_map/MAP-LCS-DataTypes.asn index 152ba42795..f4cee8b25f 100644 --- a/asn1/gsm_map/MAP-LCS-DataTypes.asn +++ b/asn1/gsm_map/MAP-LCS-DataTypes.asn @@ -1,7 +1,7 @@ -- $Id$ -- MAP-LCS-DataTypes.asn -- --- Taken from 3GPP TS 29.002 V8.9.0 (2009-04) +-- Taken from 3GPP TS 29.002 V9.0.0 (2009-12) -- -- 17.7.13 Location service data types -- @@ -53,7 +53,8 @@ IMPORTS LCSClientInternalID, LCSServiceTypeID, CellGlobalIdOrServiceAreaIdOrLAI, -PLMN-Id +PLMN-Id, + GSN-Address FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)} @@ -71,7 +72,6 @@ FROM MAP-SS-DataTypes { map-SS-DataTypes (14) version11 (11)} APN, - GSN-Address, SupportedLCS-CapabilitySets FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) @@ -654,4 +654,3 @@ SubscriberLocationReport-Res ::= SEQUENCE { END - diff --git a/asn1/gsm_map/MAP-LocationServiceOperations.asn b/asn1/gsm_map/MAP-LocationServiceOperations.asn index 08c1dea315..e226ef9b75 100644 --- a/asn1/gsm_map/MAP-LocationServiceOperations.asn +++ b/asn1/gsm_map/MAP-LocationServiceOperations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.6.8 Location service operations MAP-LocationServiceOperations { @@ -105,4 +105,3 @@ subscriberLocationReport OPERATION ::= { --Timer m END - diff --git a/asn1/gsm_map/MAP-MS-DataTypes.asn b/asn1/gsm_map/MAP-MS-DataTypes.asn index 0a4f896fd3..91cb617484 100644 --- a/asn1/gsm_map/MAP-MS-DataTypes.asn +++ b/asn1/gsm_map/MAP-MS-DataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.1 Mobile Service data types MAP-MS-DataTypes { @@ -30,8 +30,6 @@ EXPORTS IST-SupportIndicator, SupportedLCS-CapabilitySets, - -- gprs location registration types - GSN-Address, -- handover types ForwardAccessSignalling-Arg, @@ -65,7 +63,8 @@ AuthenticationFailureReportRes, DeleteSubscriberDataRes, Ext-QoS-Subscribed, Ext2-QoS-Subscribed, - Ext3-QoS-Subscribed, + Ext3-QoS-Subscribed, + Ext4-QoS-Subscribed, SubscriberData, ODB-Data, SubscriberStatus, @@ -210,7 +209,8 @@ ISDN-AddressString, TBCD-STRING, LAIFixedLength, PLMN-Id, -EMLPP-Priority +EMLPP-Priority, +GSN-Address FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)} @@ -351,7 +351,8 @@ TypeOfUpdate ::= ENUMERATED { CancellationType ::= ENUMERATED { updateProcedure (0), subscriptionWithdraw (1), - ...} + ..., + initialAttachProcedure (2)} -- The HLR shall not send values other than listed above CancelLocationRes ::= SEQUENCE { @@ -511,7 +512,11 @@ UpdateGprsLocationArg ::= SEQUENCE { eps-info [5] EPS-Info OPTIONAL, servingNodeTypeIndicator [6] NULL OPTIONAL, skipSubscriberDataUpdate [7] NULL OPTIONAL, - usedRAT-Type [8] Used-RAT-Type OPTIONAL + usedRAT-Type [8] Used-RAT-Type OPTIONAL, + gprsSubscriptionDataNotNeeded [9] NULL OPTIONAL, + nodeTypeIndicator [10] NULL OPTIONAL, + areaRestricted [11] NULL OPTIONAL, + ue-reachableIndicator [12] NULL OPTIONAL } Used-RAT-Type::= ENUMERATED { @@ -535,7 +540,8 @@ PDN-GW-Update ::= SEQUENCE{ ISR-Information::= BIT STRING { updateMME (0), - cancelSGSN (1)} (SIZE (2..8)) + cancelSGSN (1), + initialAttachIndicator (2)} (SIZE (3..8)) -- exception handling: reception of unknown bit assignments in the -- ISR-Information data type shall be discarded by the receiver @@ -552,14 +558,32 @@ SGSN-Capability ::= SEQUENCE{ supportedFeatures [9] SupportedFeatures OPTIONAL } SupportedFeatures::= BIT STRING { - odb-all (0), + odb-all-apn (0), odb-HPLMN-APN (1), odb-VPLMN-APN (2), - regSub (3)} (SIZE (4..8)) - -GSN-Address ::= OCTET STRING (SIZE (5..17)) - -- Octets are coded according to TS 3GPP TS 23.003 [17] - + odb-all-og (3), + odb-all-international-og (4), + odb-all-int-og-not-to-HPLMN-country (5), + odb-all-interzonal-og (6), + odb-all-interzonal-og-not-to-HPLMN-country (7), + odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country (8), + regSub (9), + trace (10), + lcs-all-PrivExcep (11), + lcs-universal (12), + lcs-CallSessionRelated (13), + lcs-CallSessionUnrelated (14), + lcs-PLMN-operator (15), + lcs-ServiceType (16), + lcs-all-MOLR-SS (17), + lcs-basicSelfLocation (18), + lcs-autonomousSelfLocation (19), + lcs-transferToThirdParty (20), + sm-mo-pp (21), + barring-OutgoingCalls (22), + baoc (23), + boic (24), + boicExHC (25)} (SIZE (26..40)) UpdateGprsLocationRes ::= SEQUENCE { hlr-Number ISDN-AddressString, extensionContainer ExtensionContainer OPTIONAL, @@ -975,7 +999,8 @@ InsertSubscriberDataArg ::= SEQUENCE { accessRestrictionData [19] AccessRestrictionData OPTIONAL, ics-Indicator [20] BOOLEAN OPTIONAL, eps-SubscriptionData [31] EPS-SubscriptionData OPTIONAL, - csg-SubscriptionDataList [32] CSG-SubscriptionDataList OPTIONAL } + csg-SubscriptionDataList [32] CSG-SubscriptionDataList OPTIONAL, + ue-ReachabilityRequestIndicator [33] NULL OPTIONAL } -- If the Network Access Mode parameter is sent, it shall be present only in -- the first sequence if seqmentation is used @@ -997,7 +1022,8 @@ Time ::= OCTET STRING (SIZE (4)) EPS-SubscriptionData ::= SEQUENCE { apn-oi-Replacement [0] APN-OI-Replacement OPTIONAL, - rfsp-id [2] RFSP-ID OPTIONAL, + -- this apn-oi-Replacement refers to the UE level apn-oi-Replacement. + rfsp-id [2] RFSP-ID OPTIONAL, ambr [3] AMBR OPTIONAL, apn-ConfigurationProfile [4] APN-ConfigurationProfile OPTIONAL, stn-sr [6] ISDN-AddressString OPTIONAL, @@ -1027,16 +1053,24 @@ maxNumOfAPN-Configurations INTEGER ::= 50 APN-Configuration ::= SEQUENCE { contextId [0] ContextId, - servedPartyIP-Address [1] PDP-Address OPTIONAL, - apn [2] APN, - eps-qos-Subscribed [3] EPS-QoS-Subscribed, - pdn-gw-Identity [4] PDN-GW-Identity OPTIONAL, - pdn-gw-AllocationType [5] PDN-GW-AllocationType OPTIONAL, - vplmnAddressAllowed [6] NULL OPTIONAL, - chargingCharacteristics [7] ChargingCharacteristics OPTIONAL, - ambr [8] AMBR OPTIONAL, - specificAPNInfoList [9] SpecificAPNInfoList OPTIONAL, extensionContainer [10] ExtensionContainer OPTIONAL, - ... } + pdn-Type [1] PDN-Type, + servedPartyIP-IPv4-Address [2] PDP-Address OPTIONAL, + apn [3] APN, + eps-qos-Subscribed [4] EPS-QoS-Subscribed, + pdn-gw-Identity [5] PDN-GW-Identity OPTIONAL, + pdn-gw-AllocationType [6] PDN-GW-AllocationType OPTIONAL, + vplmnAddressAllowed [7] NULL OPTIONAL, + chargingCharacteristics [8] ChargingCharacteristics OPTIONAL, + ambr [9] AMBR OPTIONAL, + specificAPNInfoList [10] SpecificAPNInfoList OPTIONAL, extensionContainer [11] ExtensionContainer OPTIONAL, + servedPartyIP-IPv6-Address [12] PDP-Address OPTIONAL, + ..., + apn-oi-Replacement [13] APN-OI-Replacement OPTIONAL + -- this apn-oi-Replacement refers to the APN level apn-oi-Replacement. + } + +PDN-Type ::= OCTET STRING (SIZE (1)) + -- Octet is coded according to TS 3GPP TS 29.274 [140] EPS-QoS-Subscribed ::= SEQUENCE { qos-Class-Identifier [0] QoS-Class-Identifier, @@ -1156,8 +1190,13 @@ PDP-Context ::= SEQUENCE { pdp-ChargingCharacteristics [1] ChargingCharacteristics OPTIONAL, ext2-QoS-Subscribed [2] Ext2-QoS-Subscribed OPTIONAL, -- ext2-QoS-Subscribed may be present only if ext-QoS-Subscribed is present. - ext3-QoS-Subscribed [3] Ext3-QoS-Subscribed OPTIONAL + ext3-QoS-Subscribed [3] Ext3-QoS-Subscribed OPTIONAL, -- 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 + -- this apn-oi-Replacement refers to the APN level apn-oi-Replacement and has + -- higher priority than UE level apn-oi-Replacement. } ContextId ::= INTEGER (1..maxNumOfPDP-Contexts) @@ -1168,7 +1207,10 @@ GPRSSubscriptionData ::= SEQUENCE { -- first segment of GPRSSubscriptionData. gprsDataList [1] GPRSDataList, extensionContainer [2] ExtensionContainer OPTIONAL, - ... } + ..., + apn-oi-Replacement [3] APN-OI-Replacement OPTIONAL + -- this apn-oi-Replacement refers to the UE level apn-oi-Replacement. + } SGSN-CAMEL-SubscriptionInfo ::= SEQUENCE { gprs-CSI [0] GPRS-CSI OPTIONAL, @@ -1261,6 +1303,12 @@ Ext2-QoS-Subscribed ::= OCTET STRING (SIZE (1..3)) Ext3-QoS-Subscribed ::= OCTET STRING (SIZE (1..2)) -- Octets 1-2 are coded according to 3GPP TS 24.008 [35] Quality of Service Octets 17-18. +Ext4-QoS-Subscribed ::= OCTET STRING (SIZE (1)) + -- Octet 1: + -- Evolved Allocation/Retention Priority. This octet encodes the Priority Level (PL), + -- the Preemption Capability (PCI) and Preemption Vulnerability (PVI) values, as + -- described in 3GPP TS 29.060 [105]. + ChargingCharacteristics ::= OCTET STRING (SIZE (2)) -- Octets are coded according to 3GPP TS 32.215. @@ -1372,7 +1420,7 @@ ODB-GeneralData ::= BIT STRING { -- ODB-GeneralData type shall be treated like unsupported ODB-GeneralData -- When the ODB-GeneralData type is removed from the HLR for a given subscriber, -- in NoteSubscriberDataModified operation sent toward the gsmSCF - -- all bits shall be set to "O". + -- all bits shall be set to “O“. ODB-HPLMN-Data ::= BIT STRING { plmn-SpecificBarringType1 (0), @@ -1383,7 +1431,7 @@ ODB-HPLMN-Data ::= BIT STRING { -- ODB-HPLMN-Data type shall be treated like unsupported ODB-HPLMN-Data -- When the ODB-HPLMN-Data type is removed from the HLR for a given subscriber, -- in NoteSubscriberDataModified operation sent toward the gsmSCF - -- all bits shall be set to "O". + -- all bits shall be set to “O“. Ext-SS-InfoList ::= SEQUENCE SIZE (1..maxNumOfSS) OF Ext-SS-Info @@ -2391,12 +2439,21 @@ LocationInformation ::= SEQUENCE { msc-Number [6] ISDN-AddressString OPTIONAL, geodeticInformation [7] GeodeticInformation OPTIONAL, currentLocationRetrieved [8] NULL OPTIONAL, - sai-Present [9] NULL OPTIONAL } + sai-Present [9] NULL OPTIONAL, + locationInformationEPS [10]LocationInformationEPS 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. +LocationInformationEPS ::= SEQUENCE { + e-utranCellGlobalIdentity [0] OCTET STRING (SIZE(7)) OPTIONAL, +-- Octets are coded as described in 3GPP TS 29.118. + trackingAreaIdentity [1] OCTET STRING (SIZE(6)) OPTIONAL, +-- Octets are coded as described in 3GPP TS 29.118. + extensionContainer [2] ExtensionContainer OPTIONAL, + ...} + LocationInformationGPRS ::= SEQUENCE { cellGlobalIdOrServiceAreaIdOrLAI [0] CellGlobalIdOrServiceAreaIdOrLAI OPTIONAL, routeingAreaIdentity [1] RAIdentity OPTIONAL, @@ -2662,7 +2719,12 @@ AnyTimeModificationArg ::= SEQUENCE { longFTN-Supported [6] NULL OPTIONAL, ..., modificationRequestFor-ODB-data [7] ModificationRequestFor-ODB-data OPTIONAL, - modificationRequestFor-IP-SM-GW-Data [8] ModificationRequestFor-IP-SM-GW-Data OPTIONAL } + modificationRequestFor-IP-SM-GW-Data [8] ModificationRequestFor-IP-SM-GW-Data OPTIONAL, + activationRequestForUE-reachability [9] ServingNode OPTIONAL } + +ServingNode ::= BIT STRING { + mme (0)} (SIZE (1..8)) +-- Other bits than listed above shall be discarded. AnyTimeModificationRes ::= SEQUENCE { ss-InfoFor-CSE [0] Ext-SS-InfoFor-CSE OPTIONAL, @@ -2730,7 +2792,8 @@ NoteSubscriberDataModifiedArg ::= SEQUENCE { camel-SubscriptionInfo [3] CAMEL-SubscriptionInfo OPTIONAL, allInformationSent [4] NULL OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, - ...} + ..., + ue-reachable [5] ServingNode OPTIONAL } NoteSubscriberDataModifiedRes ::= SEQUENCE { extensionContainer ExtensionContainer OPTIONAL, @@ -2777,4 +2840,3 @@ Ext-CallBarringInfoFor-CSE ::= SEQUENCE { ...} END - diff --git a/asn1/gsm_map/MAP-MobileServiceOperations.asn b/asn1/gsm_map/MAP-MobileServiceOperations.asn index 63089e45fe..73bd676c99 100644 --- a/asn1/gsm_map/MAP-MobileServiceOperations.asn +++ b/asn1/gsm_map/MAP-MobileServiceOperations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.4.0 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V8.4.0 V9.0.0 (2009-12) -- 17.6.1 Mobile Service Operations MAP-MobileServiceOperations { @@ -509,4 +509,3 @@ noteMM-Event OPERATION ::= { --Timer m CODE local:89 } END - diff --git a/asn1/gsm_map/MAP-OM-DataTypes.asn b/asn1/gsm_map/MAP-OM-DataTypes.asn index 0c17863aef..eef88a61bb 100644 --- a/asn1/gsm_map/MAP-OM-DataTypes.asn +++ b/asn1/gsm_map/MAP-OM-DataTypes.asn @@ -1,6 +1,6 @@ -- $Id$ -- 17.7.2 Operation and maintenance data types --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) @@ -24,7 +24,8 @@ EXPORTS IMPORTS AddressString, - IMSI + IMSI, + GSN-Address FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CommonDataTypes (18) version11 (11)} @@ -47,7 +48,8 @@ ActivateTraceModeArg ::= SEQUENCE { traceDepthList [6] TraceDepthList OPTIONAL, traceNE-TypeList [7] TraceNE-TypeList OPTIONAL, traceInterfaceList [8] TraceInterfaceList OPTIONAL, - traceEventList [9] TraceEventList OPTIONAL + traceEventList [9] TraceEventList OPTIONAL, + traceCollectionEntity [10] GSN-Address OPTIONAL } TraceReference ::= OCTET STRING (SIZE (1..2)) @@ -67,7 +69,11 @@ TraceDepthList ::= SEQUENCE { ggsn-TraceDepth [3] TraceDepth OPTIONAL, rnc-TraceDepth [4] TraceDepth OPTIONAL, bmsc-TraceDepth [5] TraceDepth OPTIONAL, - ...} + ... , + mme-TraceDepth [6] TraceDepth OPTIONAL, + sgw-TraceDepth [7] TraceDepth OPTIONAL, + pgw-TraceDepth [8] TraceDepth OPTIONAL, + eNB-TraceDepth [9] TraceDepth OPTIONAL } TraceDepth ::= ENUMERATED { minimum (0), @@ -83,7 +89,11 @@ TraceNE-TypeList ::= BIT STRING { sgsn (2), ggsn (3), rnc (4), - bm-sc (5)} (SIZE (6..16)) + bm-sc (5) , + mme (6), + sgw (7), + pgw (8), + eNB (9)} (SIZE (6..16)) -- Other bits than listed above shall be discarded. TraceInterfaceList ::= SEQUENCE { @@ -93,7 +103,11 @@ TraceInterfaceList ::= SEQUENCE { ggsn-List [3] GGSN-InterfaceList OPTIONAL, rnc-List [4] RNC-InterfaceList OPTIONAL, bmsc-List [5] BMSC-InterfaceList OPTIONAL, - ...} + ..., + mme-List [6] MME-InterfaceList OPTIONAL, + sgw-List [7] SGW-InterfaceList OPTIONAL, + pgw-List [8] PGW-InterfaceList OPTIONAL, + eNB-List [9] ENB-InterfaceList OPTIONAL} MSC-S-InterfaceList ::= BIT STRING { a (0), @@ -122,7 +136,10 @@ SGSN-InterfaceList ::= BIT STRING { map-gd (4), map-gf (5), gs (6), - ge (7)} (SIZE (8..16)) + ge (7), + s3 (8), + s4 (9), + s6d (10)} (SIZE (8..16)) -- Other bits than listed above shall be discarded. GGSN-InterfaceList ::= BIT STRING { @@ -142,13 +159,49 @@ BMSC-InterfaceList ::= BIT STRING { gmb (0)} (SIZE (1..8)) -- Other bits than listed above shall be discarded. +MME-InterfaceList ::= BIT STRING { + s1-mme (0), + s3 (1), + s6a (2), + s10 (3), + s11 (4)} (SIZE (5..8)) +-- Other bits than listed above shall be discarded. + +SGW-InterfaceList ::= BIT STRING { + s4 (0), + s5 (1), + s8b (2), + s11 (3), + gxc (4)} (SIZE (5..8)) +-- Other bits than listed above shall be discarded. + +PGW-InterfaceList ::= BIT STRING { + s2a (0), + s2b (1), + s2c (2), + s5 (3), + s6b (4), + gx (5), + s8b (6), + sgi (7)} (SIZE (8..16)) +-- Other bits than listed above shall be discarded. + +ENB-InterfaceList ::= BIT STRING { + s1-mme (0), + x2 (1), + uu (2)} (SIZE (3..8)) +-- Other bits than listed above shall be discarded. + TraceEventList ::= SEQUENCE { msc-s-List [0] MSC-S-EventList OPTIONAL, mgw-List [1] MGW-EventList OPTIONAL, sgsn-List [2] SGSN-EventList OPTIONAL, ggsn-List [3] GGSN-EventList OPTIONAL, bmsc-List [4] BMSC-EventList OPTIONAL, - ...} + ..., + mme-List [5] MME-EventList OPTIONAL, + sgw-List [6] SGW-EventList OPTIONAL, + pgw-List [7] PGW-EventList OPTIONAL} MSC-S-EventList ::= BIT STRING { mo-mtCall (0), @@ -178,6 +231,26 @@ BMSC-EventList ::= BIT STRING { mbmsMulticastServiceActivation (0)} (SIZE (1..8)) -- Other bits than listed above shall be discarded. +MME-EventList ::= BIT STRING { + ue-initiatedPDNconectivityRequest (0), + serviceRequestts (1), + initialAttachTrackingAreaUpdateDetach (2), + ue-initiatedPDNdisconnection (3), + bearerActivationModificationDeletion (4), + handover (5)} (SIZE (6..8)) +-- Other bits than listed above shall be discarded. + +SGW-EventList ::= BIT STRING { + pdn-connectionCreation (0), + pdn-connectionTermination (1), + bearerActivationModificationDeletion (2)} (SIZE (3..8)) +-- Other bits than listed above shall be discarded. + +PGW-EventList ::= BIT STRING { + pdn-connectionCreation (0), + pdn-connectionTermination (1), + bearerActivationModificationDeletion (2)} (SIZE (3..8)) +-- Other bits than listed above shall be discarded. TracePropagationList ::= SEQUENCE { traceReference [0] TraceReference OPTIONAL, @@ -213,4 +286,3 @@ DeactivateTraceModeRes ::= SEQUENCE { ...} END - diff --git a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn index e964aedf63..30e271c686 100644 --- a/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn +++ b/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) --17.6.2 Operation and Maintenance Operations MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) @@ -92,4 +92,3 @@ sendIMSI OPERATION ::= { --Timer m CODE local:58 } END - diff --git a/asn1/gsm_map/MAP-Protocol.asn b/asn1/gsm_map/MAP-Protocol.asn index 598ff3a55e..041dcbe205 100644 --- a/asn1/gsm_map/MAP-Protocol.asn +++ b/asn1/gsm_map/MAP-Protocol.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.4.0 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) --17.5 MAP operation and error codes MAP-Protocol { itu-t identified-organization (4) etsi (0) mobileDomain (0) @@ -171,4 +171,3 @@ releaseResources | mt-ForwardSM-VGCS | sendGroupCallInfo } END - diff --git a/asn1/gsm_map/MAP-SM-DataTypes.asn b/asn1/gsm_map/MAP-SM-DataTypes.asn index a647ae33b1..b801d019e4 100644 --- a/asn1/gsm_map/MAP-SM-DataTypes.asn +++ b/asn1/gsm_map/MAP-SM-DataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.6 Short message data types MAP-SM-DataTypes { diff --git a/asn1/gsm_map/MAP-SS-Code.asn b/asn1/gsm_map/MAP-SS-Code.asn index 00e12f2ade..ce64d47a78 100644 --- a/asn1/gsm_map/MAP-SS-Code.asn +++ b/asn1/gsm_map/MAP-SS-Code.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.5 Supplementary service codes MAP-SS-Code { @@ -187,4 +187,3 @@ transferToThirdParty SS-Code ::= '11000011'B -- allow an MS to request transfer of its location to another LCS client END - diff --git a/asn1/gsm_map/MAP-SS-DataTypes.asn b/asn1/gsm_map/MAP-SS-DataTypes.asn index d3b3253390..ec7d6b44cd 100644 --- a/asn1/gsm_map/MAP-SS-DataTypes.asn +++ b/asn1/gsm_map/MAP-SS-DataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.4 Supplementary service data types MAP-SS-DataTypes { @@ -339,4 +339,3 @@ EraseCC-EntryRes ::= SEQUENCE { ...} END - diff --git a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn index 36f59c08bd..bf63e4c38a 100644 --- a/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn +++ b/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.6.5 Short message service operations MAP-ShortMessageServiceOperations { @@ -170,5 +170,3 @@ mt-ForwardSM-VGCS OPERATION ::= { --Timer ml END - - diff --git a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn index e2e1a52348..2d00ee4b89 100644 --- a/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn +++ b/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) --17.6.4 Supplementary service operations MAP-SupplementaryServiceOperations { @@ -297,4 +297,3 @@ eraseCC-Entry OPERATION ::= { --Timer m CODE local:77 } END - diff --git a/asn1/gsm_map/MAP-TS-Code.asn b/asn1/gsm_map/MAP-TS-Code.asn index 0900f9f9e5..961a3417d9 100644 --- a/asn1/gsm_map/MAP-TS-Code.asn +++ b/asn1/gsm_map/MAP-TS-Code.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 29.002 V8.9.0 (2009-04) +-- 3GPP TS 29.002 V9.0.0 (2009-12) -- 17.7.9 Teleservice Codes MAP-TS-Code { @@ -89,4 +89,3 @@ plmn-specificTS-E TeleserviceCode ::= '11011110'B plmn-specificTS-F TeleserviceCode ::= '11011111'B END - diff --git a/asn1/gsm_map/SS-DataTypes.asn b/asn1/gsm_map/SS-DataTypes.asn index 03c8198dc0..49c1c9567b 100644 --- a/asn1/gsm_map/SS-DataTypes.asn +++ b/asn1/gsm_map/SS-DataTypes.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 24.080 V7.4.0 (2007-09) +-- 3GPP TS 24.080 V9.0.0 (2009-12) -- 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, +-- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes CUG-Index, NotificationToMSUser FROM MAP-MS-DataTypes { @@ -38,11 +38,12 @@ maxSignalInfoLength, ISDN-AddressString, ISDN-SubaddressString, AlertingPattern, -IMSI, LCSClientExternalID, AddressString, LCSServiceTypeID, -AgeOfLocationInformation +AgeOfLocationInformation, +GSN-Address -- WS fix + FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CommonDataTypes (18) version10 (10)} @@ -91,13 +92,6 @@ NotifySS-Arg ::= SEQUENCE{ alertingPattern [22] AlertingPattern OPTIONAL, multicall-Indicator [23] Multicall-Indicator OPTIONAL} - -BeginSubscriberActivityArg ::= SEQUENCE { - imsi IMSI, - originatingEntityNumber ISDN-AddressString, - msisdn [PRIVATE 28] AddressString OPTIONAL, - ... } - -- The nameIndicator is defined because of CNAP. Multicall-Indicator ::= ENUMERATED { diff --git a/asn1/gsm_map/SS-Errors.asn b/asn1/gsm_map/SS-Errors.asn index 2aa4358191..233d363fcb 100644 --- a/asn1/gsm_map/SS-Errors.asn +++ b/asn1/gsm_map/SS-Errors.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 24.080 V7.4.0 (2007-09) +-- 3GPP TS 24.080 V9.0.0 (2009-12) -- 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. diff --git a/asn1/gsm_map/SS-Operations.asn b/asn1/gsm_map/SS-Operations.asn index 0150c2cdae..9003c91a15 100644 --- a/asn1/gsm_map/SS-Operations.asn +++ b/asn1/gsm_map/SS-Operations.asn @@ -1,5 +1,5 @@ -- $Id$ --- 3GPP TS 24.080 V7.4.0 (2007-09) +-- 3GPP TS 24.080 V9.0.0 (2009-12) -- 4.2 Operation types SS-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) @@ -14,7 +14,7 @@ EXPORTS -- exports operations -- operations defined in this specification -processUnstructuredSS-Data, beginSubscriberActivity, notifySS, forwardChargeAdvice, forwardCUG-Info, buildMPTY, holdMPTY, retrieveMPTY, splitMPTY, explicitCT, accessRegisterCCEntry, callDeflection, userUserService, +processUnstructuredSS-Data, notifySS, forwardChargeAdvice, forwardCUG-Info, buildMPTY, holdMPTY, retrieveMPTY, splitMPTY, explicitCT, accessRegisterCCEntry, callDeflection, userUserService, lcs-LocationNotification, lcs-MOLR, lcs-AreaEventRequest, lcs-AreaEventReport, lcs-AreaEventCancellation, lcs-PeriodicLocationRequest, lcs-LocationUpdate, lcs-PeriodicLocationCancellation; IMPORTS @@ -32,7 +32,6 @@ Remote-Operations-Information-Objects { -- imports SS-data types NotifySS-Arg, -BeginSubscriberActivityArg, ForwardChargeAdviceArg, ForwardCUG-InfoArg, SS-UserData, @@ -88,10 +87,6 @@ processUnstructuredSS-Data OPERATION ::= { -- Timer T(PUSSD)= 15s to 30s unexpectedDataValue} CODE local:19 } -beginSubscriberActivity OPERATION ::= { - ARGUMENT BeginSubscriberActivityArg - CODE local:54 } - notifySS OPERATION ::= { ARGUMENT NotifySS-Arg CODE local:16 } diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 94ee779204..5ca1375cb1 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -12,7 +12,7 @@ /* packet-gsm_map-template.c * Routines for GSM MobileApplication packet dissection * including GSM SS. - * Copyright 2004 - 2009 , Anders Broman <anders.broman [AT] ericsson.com> + * Copyright 2004 - 2010 , Anders Broman <anders.broman [AT] ericsson.com> * Based on the dissector by: * Felix Fei <felix.fei [AT] utstar.com> * and Michael Lum <mlum [AT] telostech.com> @@ -1077,7 +1077,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ /* reserved traceSubscriberActivity (52) */ /* undefined 53 */ case 54: /*beginSubscriberActivity*/ - offset=dissect_gsm_ss_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1); + offset=dissect_gsm_old_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1); break; case 55: /*sendIdentification*/ offset=dissect_mc_message(tvb, offset, actx, tree, diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 6ef0c18e50..fcb9a8ec60 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -4449,7 +4449,7 @@ static const ber_sequence_t T_pdp_ContextchangeOfPositionSpecificInformation_seq { &hf_camel_endUserAddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_EndUserAddress }, { &hf_camel_qualityOfService, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_QualityOfService }, { &hf_camel_timeAndTimeZone, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_TimeAndTimezone }, - { &hf_camel_gGSNAddress , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_camel_gGSNAddress , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -4553,7 +4553,7 @@ static const ber_sequence_t T_pDPContextEstablishmentAcknowledgementSpecificInfo { &hf_camel_qualityOfService, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_QualityOfService }, { &hf_camel_locationInformationGPRS, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_LocationInformationGPRS }, { &hf_camel_timeAndTimeZone, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_TimeAndTimezone }, - { &hf_camel_gGSNAddress , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_camel_gGSNAddress , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -5839,7 +5839,7 @@ static const ber_sequence_t InitialDPGPRSArg_sequence[] = { { &hf_camel_locationInformationGPRS, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_LocationInformationGPRS }, { &hf_camel_pDPInitiationType, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_PDPInitiationType }, { &hf_camel_extensions , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_Extensions }, - { &hf_camel_gGSNAddress , BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_camel_gGSNAddress , BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_camel_secondaryPDP_context, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_NULL }, { &hf_camel_iMEI , BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMEI }, { NULL, 0, 0, 0, NULL } @@ -8387,7 +8387,7 @@ void proto_register_camel(void) { { &hf_camel_gGSNAddress, { "gGSNAddress", "camel.gGSNAddress", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_camel_detachSpecificInformation, { "detachSpecificInformation", "camel.detachSpecificInformation", FT_NONE, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 661f92ee75..1dd4de2b0d 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -20,7 +20,7 @@ /* packet-gsm_map-template.c * Routines for GSM MobileApplication packet dissection * including GSM SS. - * Copyright 2004 - 2009 , Anders Broman <anders.broman [AT] ericsson.com> + * Copyright 2004 - 2010 , Anders Broman <anders.broman [AT] ericsson.com> * Based on the dissector by: * Felix Fei <felix.fei [AT] utstar.com> * and Michael Lum <mlum [AT] telostech.com> @@ -340,23 +340,35 @@ static int hf_gsm_map_om_traceDepthList = -1; /* TraceDepthList */ static int hf_gsm_map_om_traceNE_TypeList = -1; /* TraceNE_TypeList */ static int hf_gsm_map_om_traceInterfaceList = -1; /* TraceInterfaceList */ static int hf_gsm_map_om_traceEventList = -1; /* TraceEventList */ +static int hf_gsm_map_om_traceCollectionEntity = -1; /* GSN_Address */ static int hf_gsm_map_om_msc_s_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_mgw_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_sgsn_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_ggsn_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_rnc_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_bmsc_TraceDepth = -1; /* TraceDepth */ +static int hf_gsm_map_om_mme_TraceDepth = -1; /* TraceDepth */ +static int hf_gsm_map_om_sgw_TraceDepth = -1; /* TraceDepth */ +static int hf_gsm_map_om_pgw_TraceDepth = -1; /* TraceDepth */ +static int hf_gsm_map_om_eNB_TraceDepth = -1; /* TraceDepth */ static int hf_gsm_map_om_msc_s_List = -1; /* MSC_S_InterfaceList */ static int hf_gsm_map_om_mgw_List = -1; /* MGW_InterfaceList */ static int hf_gsm_map_om_sgsn_List = -1; /* SGSN_InterfaceList */ static int hf_gsm_map_om_ggsn_List = -1; /* GGSN_InterfaceList */ static int hf_gsm_map_om_rnc_List = -1; /* RNC_InterfaceList */ static int hf_gsm_map_om_bmsc_List = -1; /* BMSC_InterfaceList */ +static int hf_gsm_map_om_mme_List = -1; /* MME_InterfaceList */ +static int hf_gsm_map_om_sgw_List = -1; /* SGW_InterfaceList */ +static int hf_gsm_map_om_pgw_List = -1; /* PGW_InterfaceList */ +static int hf_gsm_map_om_eNB_List = -1; /* ENB_InterfaceList */ static int hf_gsm_map_om_msc_s_List_01 = -1; /* MSC_S_EventList */ static int hf_gsm_map_om_mgw_List_01 = -1; /* MGW_EventList */ static int hf_gsm_map_om_sgsn_List_01 = -1; /* SGSN_EventList */ static int hf_gsm_map_om_ggsn_List_01 = -1; /* GGSN_EventList */ static int hf_gsm_map_om_bmsc_List_01 = -1; /* BMSC_EventList */ +static int hf_gsm_map_om_mme_List_01 = -1; /* MME_EventList */ +static int hf_gsm_map_om_sgw_List_01 = -1; /* SGW_EventList */ +static int hf_gsm_map_om_pgw_List_01 = -1; /* PGW_EventList */ static int hf_gsm_map_om_traceRecordingSessionReference = -1; /* TraceRecordingSessionReference */ static int hf_gsm_map_om_rnc_InterfaceList = -1; /* RNC_InterfaceList */ static int hf_gsm_map_om_msc_s_InterfaceList = -1; /* MSC_S_InterfaceList */ @@ -371,6 +383,10 @@ static int hf_gsm_map_om_TraceNE_TypeList_sgsn = -1; static int hf_gsm_map_om_TraceNE_TypeList_ggsn = -1; static int hf_gsm_map_om_TraceNE_TypeList_rnc = -1; static int hf_gsm_map_om_TraceNE_TypeList_bm_sc = -1; +static int hf_gsm_map_om_TraceNE_TypeList_mme = -1; +static int hf_gsm_map_om_TraceNE_TypeList_sgw = -1; +static int hf_gsm_map_om_TraceNE_TypeList_pgw = -1; +static int hf_gsm_map_om_TraceNE_TypeList_eNB = -1; static int hf_gsm_map_om_MSC_S_InterfaceList_a = -1; static int hf_gsm_map_om_MSC_S_InterfaceList_iu = -1; static int hf_gsm_map_om_MSC_S_InterfaceList_mc = -1; @@ -392,6 +408,9 @@ static int hf_gsm_map_om_SGSN_InterfaceList_map_gd = -1; static int hf_gsm_map_om_SGSN_InterfaceList_map_gf = -1; static int hf_gsm_map_om_SGSN_InterfaceList_gs = -1; static int hf_gsm_map_om_SGSN_InterfaceList_ge = -1; +static int hf_gsm_map_om_SGSN_InterfaceList_s3 = -1; +static int hf_gsm_map_om_SGSN_InterfaceList_s4 = -1; +static int hf_gsm_map_om_SGSN_InterfaceList_s6d = -1; static int hf_gsm_map_om_GGSN_InterfaceList_gn = -1; static int hf_gsm_map_om_GGSN_InterfaceList_gi = -1; static int hf_gsm_map_om_GGSN_InterfaceList_gmb = -1; @@ -400,6 +419,27 @@ static int hf_gsm_map_om_RNC_InterfaceList_iur = -1; static int hf_gsm_map_om_RNC_InterfaceList_iub = -1; static int hf_gsm_map_om_RNC_InterfaceList_uu = -1; static int hf_gsm_map_om_BMSC_InterfaceList_gmb = -1; +static int hf_gsm_map_om_MME_InterfaceList_s1_mme = -1; +static int hf_gsm_map_om_MME_InterfaceList_s3 = -1; +static int hf_gsm_map_om_MME_InterfaceList_s6a = -1; +static int hf_gsm_map_om_MME_InterfaceList_s10 = -1; +static int hf_gsm_map_om_MME_InterfaceList_s11 = -1; +static int hf_gsm_map_om_SGW_InterfaceList_s4 = -1; +static int hf_gsm_map_om_SGW_InterfaceList_s5 = -1; +static int hf_gsm_map_om_SGW_InterfaceList_s8b = -1; +static int hf_gsm_map_om_SGW_InterfaceList_s11 = -1; +static int hf_gsm_map_om_SGW_InterfaceList_gxc = -1; +static int hf_gsm_map_om_PGW_InterfaceList_s2a = -1; +static int hf_gsm_map_om_PGW_InterfaceList_s2b = -1; +static int hf_gsm_map_om_PGW_InterfaceList_s2c = -1; +static int hf_gsm_map_om_PGW_InterfaceList_s5 = -1; +static int hf_gsm_map_om_PGW_InterfaceList_s6b = -1; +static int hf_gsm_map_om_PGW_InterfaceList_gx = -1; +static int hf_gsm_map_om_PGW_InterfaceList_s8b = -1; +static int hf_gsm_map_om_PGW_InterfaceList_sgi = -1; +static int hf_gsm_map_om_ENB_InterfaceList_s1_mme = -1; +static int hf_gsm_map_om_ENB_InterfaceList_x2 = -1; +static int hf_gsm_map_om_ENB_InterfaceList_uu = -1; static int hf_gsm_map_om_MSC_S_EventList_mo_mtCall = -1; static int hf_gsm_map_om_MSC_S_EventList_mo_mt_sms = -1; static int hf_gsm_map_om_MSC_S_EventList_lu_imsiAttach_imsiDetach = -1; @@ -413,6 +453,18 @@ static int hf_gsm_map_om_SGSN_EventList_mbmsContext = -1; static int hf_gsm_map_om_GGSN_EventList_pdpContext = -1; static int hf_gsm_map_om_GGSN_EventList_mbmsContext = -1; static int hf_gsm_map_om_BMSC_EventList_mbmsMulticastServiceActivation = -1; +static int hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest = -1; +static int hf_gsm_map_om_MME_EventList_serviceRequestts = -1; +static int hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach = -1; +static int hf_gsm_map_om_MME_EventList_ue_initiatedPDNdisconnection = -1; +static int hf_gsm_map_om_MME_EventList_bearerActivationModificationDeletion = -1; +static int hf_gsm_map_om_MME_EventList_handover = -1; +static int hf_gsm_map_om_SGW_EventList_pdn_connectionCreation = -1; +static int hf_gsm_map_om_SGW_EventList_pdn_connectionTermination = -1; +static int hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion = -1; +static int hf_gsm_map_om_PGW_EventList_pdn_connectionCreation = -1; +static int hf_gsm_map_om_PGW_EventList_pdn_connectionTermination = -1; +static int hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion = -1; /* --- Module MAP-MS-DataTypes --- --- --- */ @@ -484,6 +536,10 @@ static int hf_gsm_map_ms_ps_LCS_NotSupportedByUE = -1; /* NULL */ static int hf_gsm_map_ms_eps_info = -1; /* EPS_Info */ static int hf_gsm_map_ms_servingNodeTypeIndicator = -1; /* NULL */ static int hf_gsm_map_ms_usedRAT_Type = -1; /* Used_RAT_Type */ +static int hf_gsm_map_ms_gprsSubscriptionDataNotNeeded = -1; /* NULL */ +static int hf_gsm_map_ms_nodeTypeIndicator = -1; /* NULL */ +static int hf_gsm_map_ms_areaRestricted = -1; /* NULL */ +static int hf_gsm_map_ms_ue_reachableIndicator = -1; /* NULL */ static int hf_gsm_map_ms_pdn_gw_update = -1; /* PDN_GW_Update */ static int hf_gsm_map_ms_isr_Information = -1; /* ISR_Information */ static int hf_gsm_map_ms_apn = -1; /* APN */ @@ -577,12 +633,14 @@ static int hf_gsm_map_ms_defaultContext = -1; /* ContextId */ static int hf_gsm_map_ms_completeDataListIncluded = -1; /* NULL */ static int hf_gsm_map_ms_epsDataList = -1; /* EPS_DataList */ static int hf_gsm_map_ms_EPS_DataList_item = -1; /* APN_Configuration */ -static int hf_gsm_map_ms_servedPartyIP_Address = -1; /* PDP_Address */ +static int hf_gsm_map_ms_pdn_Type = -1; /* PDN_Type */ +static int hf_gsm_map_ms_servedPartyIP_IPv4_Address = -1; /* PDP_Address */ static int hf_gsm_map_ms_eps_qos_Subscribed = -1; /* EPS_QoS_Subscribed */ static int hf_gsm_map_ms_pdn_gw_AllocationType = -1; /* PDN_GW_AllocationType */ static int hf_gsm_map_ms_vplmnAddressAllowed = -1; /* NULL */ static int hf_gsm_map_ms_chargingCharacteristics = -1; /* ChargingCharacteristics */ static int hf_gsm_map_ms_specificAPNInfoList = -1; /* SpecificAPNInfoList */ +static int hf_gsm_map_ms_servedPartyIP_IPv6_Address = -1; /* PDP_Address */ static int hf_gsm_map_ms_qos_Class_Identifier = -1; /* QoS_Class_Identifier */ static int hf_gsm_map_ms_allocation_Retention_Priority = -1; /* Allocation_Retention_Priority */ static int hf_gsm_map_ms_max_RequestedBandwidth_UL = -1; /* Bandwidth */ @@ -608,6 +666,7 @@ static int hf_gsm_map_ms_ext_QoS_Subscribed = -1; /* Ext_QoS_Subscribed */ static int hf_gsm_map_ms_pdp_ChargingCharacteristics = -1; /* ChargingCharacteristics */ 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_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 */ @@ -806,6 +865,9 @@ 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_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_assumedIdle = -1; /* NULL */ @@ -873,6 +935,7 @@ static int hf_gsm_map_ms_modificationRequestFor_CB_Info = -1; /* ModificationRe static int hf_gsm_map_ms_modificationRequestFor_CSI = -1; /* ModificationRequestFor_CSI */ static int hf_gsm_map_ms_modificationRequestFor_ODB_data = -1; /* ModificationRequestFor_ODB_data */ static int hf_gsm_map_ms_modificationRequestFor_IP_SM_GW_Data = -1; /* ModificationRequestFor_IP_SM_GW_Data */ +static int hf_gsm_map_ms_activationRequestForUE_reachability = -1; /* ServingNode */ static int hf_gsm_map_ms_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 */ @@ -883,6 +946,7 @@ static int hf_gsm_map_ms_modifyRegistrationStatus = -1; /* ModificationInstruct static int hf_gsm_map_ms_forwardingInfoFor_CSE = -1; /* Ext_ForwardingInfoFor_CSE */ static int hf_gsm_map_ms_callBarringInfoFor_CSE = -1; /* Ext_CallBarringInfoFor_CSE */ static int hf_gsm_map_ms_allInformationSent = -1; /* NULL */ +static int hf_gsm_map_ms_ue_reachable = -1; /* ServingNode */ static int hf_gsm_map_ms_eventMet = -1; /* MM_Code */ static int hf_gsm_map_ms_supportedCAMELPhases = -1; /* SupportedCamelPhases */ static int hf_gsm_map_ms_offeredCamel4Functionalities = -1; /* OfferedCamel4Functionalities */ @@ -902,6 +966,7 @@ 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; static int hf_gsm_map_ms_SupportedRAT_Types_geran = -1; @@ -915,10 +980,33 @@ static int hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet4 = -1; static int hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet5 = -1; static int hf_gsm_map_ms_ISR_Information_updateMME = -1; static int hf_gsm_map_ms_ISR_Information_cancelSGSN = -1; -static int hf_gsm_map_ms_SupportedFeatures_odb_all = -1; +static int hf_gsm_map_ms_ISR_Information_initialAttachIndicator = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_apn = -1; static int hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN = -1; static int hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_og = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_international_og = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_int_og_not_to_HPLMN_country = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_not_to_HPLMN_country = -1; +static int hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_and_internat_og_not_to_HPLMN_country = -1; static int hf_gsm_map_ms_SupportedFeatures_regSub = -1; +static int hf_gsm_map_ms_SupportedFeatures_trace = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_all_PrivExcep = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_universal = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionRelated = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionUnrelated = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_PLMN_operator = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_ServiceType = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_all_MOLR_SS = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_basicSelfLocation = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_autonomousSelfLocation = -1; +static int hf_gsm_map_ms_SupportedFeatures_lcs_transferToThirdParty = -1; +static int hf_gsm_map_ms_SupportedFeatures_sm_mo_pp = -1; +static int hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls = -1; +static int hf_gsm_map_ms_SupportedFeatures_baoc = -1; +static int hf_gsm_map_ms_SupportedFeatures_boic = -1; +static int hf_gsm_map_ms_SupportedFeatures_boicExHC = -1; static int hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus = -1; static int hf_gsm_map_ms_RequestedEquipmentInfo_bmuef = -1; static int hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed = -1; @@ -1008,6 +1096,7 @@ static int hf_gsm_map_ms_OfferedCamel4Functionalities_collectInformation = -1; static int hf_gsm_map_ms_AdditionalSubscriptions_privilegedUplinkRequest = -1; static int hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest = -1; static int hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset = -1; +static int hf_gsm_map_ms_ServingNode_mme = -1; /* --- Module MAP-CH-DataTypes --- --- --- */ @@ -1362,6 +1451,8 @@ static int hf_gsm_old_cug_CheckInfo = -1; /* CUG_CheckInfo */ static int hf_gsm_old_numberOfForwarding = -1; /* NumberOfForwarding */ static int hf_gsm_old_networkSignalInfo = -1; /* ExternalSignalInfo */ static int hf_gsm_old_routingInfo = -1; /* RoutingInfo */ +static int hf_gsm_old_originatingEntityNumber = -1; /* ISDN_AddressString */ +static int hf_gsm_old_msisdn_02 = -1; /* AddressString */ /* --- Module SS-DataTypes --- --- --- */ @@ -1378,9 +1469,6 @@ static int hf_gsm_ss_nameIndicator = -1; /* NameIndicator */ static int hf_gsm_ss_ccbs_Feature = -1; /* CCBS_Feature */ static int hf_gsm_ss_alertingPattern = -1; /* AlertingPattern */ static int hf_gsm_ss_multicall_Indicator = -1; /* Multicall_Indicator */ -static int hf_gsm_ss_imsi = -1; /* IMSI */ -static int hf_gsm_ss_originatingEntityNumber = -1; /* ISDN_AddressString */ -static int hf_gsm_ss_msisdn = -1; /* AddressString */ static int hf_gsm_ss_chargingInformation = -1; /* ChargingInformation */ static int hf_gsm_ss_e1 = -1; /* E1 */ static int hf_gsm_ss_e2 = -1; /* E2 */ @@ -1617,12 +1705,19 @@ static gint ett_gsm_map_om_SGSN_InterfaceList = -1; static gint ett_gsm_map_om_GGSN_InterfaceList = -1; static gint ett_gsm_map_om_RNC_InterfaceList = -1; static gint ett_gsm_map_om_BMSC_InterfaceList = -1; +static gint ett_gsm_map_om_MME_InterfaceList = -1; +static gint ett_gsm_map_om_SGW_InterfaceList = -1; +static gint ett_gsm_map_om_PGW_InterfaceList = -1; +static gint ett_gsm_map_om_ENB_InterfaceList = -1; static gint ett_gsm_map_om_TraceEventList = -1; static gint ett_gsm_map_om_MSC_S_EventList = -1; static gint ett_gsm_map_om_MGW_EventList = -1; static gint ett_gsm_map_om_SGSN_EventList = -1; static gint ett_gsm_map_om_GGSN_EventList = -1; static gint ett_gsm_map_om_BMSC_EventList = -1; +static gint ett_gsm_map_om_MME_EventList = -1; +static gint ett_gsm_map_om_SGW_EventList = -1; +static gint ett_gsm_map_om_PGW_EventList = -1; static gint ett_gsm_map_om_TracePropagationList = -1; static gint ett_gsm_map_om_ActivateTraceModeRes = -1; static gint ett_gsm_map_om_DeactivateTraceModeArg = -1; @@ -1814,6 +1909,7 @@ static gint ett_gsm_map_ms_MNPInfoRes = -1; static gint ett_gsm_map_ms_GPRSMSClass = -1; 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_SubscriberState = -1; static gint ett_gsm_map_ms_PS_SubscriberState = -1; @@ -1831,6 +1927,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_ServingNode = -1; static gint ett_gsm_map_ms_AnyTimeModificationRes = -1; static gint ett_gsm_map_ms_ModificationRequestFor_CF_Info = -1; static gint ett_gsm_map_ms_ModificationRequestFor_CB_Info = -1; @@ -1997,11 +2094,11 @@ static gint ett_gsm_old_SM_RP_DAold = -1; static gint ett_gsm_old_SM_RP_OAold = -1; static gint ett_gsm_old_SendRoutingInfoArgV2 = -1; static gint ett_gsm_old_SendRoutingInfoResV2 = -1; +static gint ett_gsm_old_BeginSubscriberActivityArg = -1; /* --- Module SS-DataTypes --- --- --- */ static gint ett_gsm_ss_NotifySS_Arg = -1; -static gint ett_gsm_ss_BeginSubscriberActivityArg = -1; static gint ett_gsm_ss_ForwardChargeAdviceArg = -1; static gint ett_gsm_ss_ChargingInformation = -1; static gint ett_gsm_ss_ForwardCUG_InfoArg = -1; @@ -3135,6 +3232,41 @@ dissect_gsm_map_AlertingPattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in int +dissect_gsm_map_GSN_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 525 "gsm_map.cnf" + + tvbuff_t *parameter_tvb; + guint8 octet; + proto_tree *subtree; + + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + ¶meter_tvb); + + + if (!parameter_tvb) + return offset; + subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_pdptypenumber); + + octet = tvb_get_guint8(parameter_tvb,0); + switch(octet){ + case 0x04: /* IPv4 */ + proto_tree_add_item(subtree, hf_gsm_map_GSNAddress_IPv4, parameter_tvb, 1, tvb_length_remaining(parameter_tvb, 1), FALSE); + break; + case 0x50: /* IPv4 */ + proto_tree_add_item(subtree, hf_gsm_map_GSNAddress_IPv4, parameter_tvb, 1, tvb_length_remaining(parameter_tvb, 1), FALSE); + break; + default: + break; + } + + + + return offset; +} + + + +int dissect_gsm_map_IMSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_gsm_map_TBCD_STRING(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -5951,6 +6083,10 @@ static const ber_sequence_t gsm_map_om_TraceDepthList_sequence[] = { { &hf_gsm_map_om_ggsn_TraceDepth, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, { &hf_gsm_map_om_rnc_TraceDepth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, { &hf_gsm_map_om_bmsc_TraceDepth, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, + { &hf_gsm_map_om_mme_TraceDepth, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, + { &hf_gsm_map_om_sgw_TraceDepth, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, + { &hf_gsm_map_om_pgw_TraceDepth, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, + { &hf_gsm_map_om_eNB_TraceDepth, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceDepth }, { NULL, 0, 0, 0, NULL } }; @@ -5970,6 +6106,10 @@ static const asn_namedbit gsm_map_om_TraceNE_TypeList_bits[] = { { 3, &hf_gsm_map_om_TraceNE_TypeList_ggsn, -1, -1, "ggsn", NULL }, { 4, &hf_gsm_map_om_TraceNE_TypeList_rnc, -1, -1, "rnc", NULL }, { 5, &hf_gsm_map_om_TraceNE_TypeList_bm_sc, -1, -1, "bm-sc", NULL }, + { 6, &hf_gsm_map_om_TraceNE_TypeList_mme, -1, -1, "mme", NULL }, + { 7, &hf_gsm_map_om_TraceNE_TypeList_sgw, -1, -1, "sgw", NULL }, + { 8, &hf_gsm_map_om_TraceNE_TypeList_pgw, -1, -1, "pgw", NULL }, + { 9, &hf_gsm_map_om_TraceNE_TypeList_eNB, -1, -1, "eNB", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -6033,6 +6173,9 @@ static const asn_namedbit gsm_map_om_SGSN_InterfaceList_bits[] = { { 5, &hf_gsm_map_om_SGSN_InterfaceList_map_gf, -1, -1, "map-gf", NULL }, { 6, &hf_gsm_map_om_SGSN_InterfaceList_gs, -1, -1, "gs", NULL }, { 7, &hf_gsm_map_om_SGSN_InterfaceList_ge, -1, -1, "ge", NULL }, + { 8, &hf_gsm_map_om_SGSN_InterfaceList_s3, -1, -1, "s3", NULL }, + { 9, &hf_gsm_map_om_SGSN_InterfaceList_s4, -1, -1, "s4", NULL }, + { 10, &hf_gsm_map_om_SGSN_InterfaceList_s6d, -1, -1, "s6d", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -6096,6 +6239,83 @@ dissect_gsm_map_om_BMSC_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _ } +static const asn_namedbit gsm_map_om_MME_InterfaceList_bits[] = { + { 0, &hf_gsm_map_om_MME_InterfaceList_s1_mme, -1, -1, "s1-mme", NULL }, + { 1, &hf_gsm_map_om_MME_InterfaceList_s3, -1, -1, "s3", NULL }, + { 2, &hf_gsm_map_om_MME_InterfaceList_s6a, -1, -1, "s6a", NULL }, + { 3, &hf_gsm_map_om_MME_InterfaceList_s10, -1, -1, "s10", NULL }, + { 4, &hf_gsm_map_om_MME_InterfaceList_s11, -1, -1, "s11", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_MME_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_MME_InterfaceList_bits, hf_index, ett_gsm_map_om_MME_InterfaceList, + NULL); + + return offset; +} + + +static const asn_namedbit gsm_map_om_SGW_InterfaceList_bits[] = { + { 0, &hf_gsm_map_om_SGW_InterfaceList_s4, -1, -1, "s4", NULL }, + { 1, &hf_gsm_map_om_SGW_InterfaceList_s5, -1, -1, "s5", NULL }, + { 2, &hf_gsm_map_om_SGW_InterfaceList_s8b, -1, -1, "s8b", NULL }, + { 3, &hf_gsm_map_om_SGW_InterfaceList_s11, -1, -1, "s11", NULL }, + { 4, &hf_gsm_map_om_SGW_InterfaceList_gxc, -1, -1, "gxc", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_SGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_SGW_InterfaceList_bits, hf_index, ett_gsm_map_om_SGW_InterfaceList, + NULL); + + return offset; +} + + +static const asn_namedbit gsm_map_om_PGW_InterfaceList_bits[] = { + { 0, &hf_gsm_map_om_PGW_InterfaceList_s2a, -1, -1, "s2a", NULL }, + { 1, &hf_gsm_map_om_PGW_InterfaceList_s2b, -1, -1, "s2b", NULL }, + { 2, &hf_gsm_map_om_PGW_InterfaceList_s2c, -1, -1, "s2c", NULL }, + { 3, &hf_gsm_map_om_PGW_InterfaceList_s5, -1, -1, "s5", NULL }, + { 4, &hf_gsm_map_om_PGW_InterfaceList_s6b, -1, -1, "s6b", NULL }, + { 5, &hf_gsm_map_om_PGW_InterfaceList_gx, -1, -1, "gx", NULL }, + { 6, &hf_gsm_map_om_PGW_InterfaceList_s8b, -1, -1, "s8b", NULL }, + { 7, &hf_gsm_map_om_PGW_InterfaceList_sgi, -1, -1, "sgi", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_PGW_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_PGW_InterfaceList_bits, hf_index, ett_gsm_map_om_PGW_InterfaceList, + NULL); + + return offset; +} + + +static const asn_namedbit gsm_map_om_ENB_InterfaceList_bits[] = { + { 0, &hf_gsm_map_om_ENB_InterfaceList_s1_mme, -1, -1, "s1-mme", NULL }, + { 1, &hf_gsm_map_om_ENB_InterfaceList_x2, -1, -1, "x2", NULL }, + { 2, &hf_gsm_map_om_ENB_InterfaceList_uu, -1, -1, "uu", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_ENB_InterfaceList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_ENB_InterfaceList_bits, hf_index, ett_gsm_map_om_ENB_InterfaceList, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_om_TraceInterfaceList_sequence[] = { { &hf_gsm_map_om_msc_s_List, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MSC_S_InterfaceList }, { &hf_gsm_map_om_mgw_List , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MGW_InterfaceList }, @@ -6103,6 +6323,10 @@ static const ber_sequence_t gsm_map_om_TraceInterfaceList_sequence[] = { { &hf_gsm_map_om_ggsn_List, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_GGSN_InterfaceList }, { &hf_gsm_map_om_rnc_List , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_RNC_InterfaceList }, { &hf_gsm_map_om_bmsc_List, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_BMSC_InterfaceList }, + { &hf_gsm_map_om_mme_List , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MME_InterfaceList }, + { &hf_gsm_map_om_sgw_List , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_SGW_InterfaceList }, + { &hf_gsm_map_om_pgw_List , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_PGW_InterfaceList }, + { &hf_gsm_map_om_eNB_List , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_ENB_InterfaceList }, { NULL, 0, 0, 0, NULL } }; @@ -6198,12 +6422,69 @@ dissect_gsm_map_om_BMSC_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } +static const asn_namedbit gsm_map_om_MME_EventList_bits[] = { + { 0, &hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest, -1, -1, "ue-initiatedPDNconectivityRequest", NULL }, + { 1, &hf_gsm_map_om_MME_EventList_serviceRequestts, -1, -1, "serviceRequestts", NULL }, + { 2, &hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach, -1, -1, "initialAttachTrackingAreaUpdateDetach", NULL }, + { 3, &hf_gsm_map_om_MME_EventList_ue_initiatedPDNdisconnection, -1, -1, "ue-initiatedPDNdisconnection", NULL }, + { 4, &hf_gsm_map_om_MME_EventList_bearerActivationModificationDeletion, -1, -1, "bearerActivationModificationDeletion", NULL }, + { 5, &hf_gsm_map_om_MME_EventList_handover, -1, -1, "handover", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_MME_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_MME_EventList_bits, hf_index, ett_gsm_map_om_MME_EventList, + NULL); + + return offset; +} + + +static const asn_namedbit gsm_map_om_SGW_EventList_bits[] = { + { 0, &hf_gsm_map_om_SGW_EventList_pdn_connectionCreation, -1, -1, "pdn-connectionCreation", NULL }, + { 1, &hf_gsm_map_om_SGW_EventList_pdn_connectionTermination, -1, -1, "pdn-connectionTermination", NULL }, + { 2, &hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion, -1, -1, "bearerActivationModificationDeletion", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_SGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_SGW_EventList_bits, hf_index, ett_gsm_map_om_SGW_EventList, + NULL); + + return offset; +} + + +static const asn_namedbit gsm_map_om_PGW_EventList_bits[] = { + { 0, &hf_gsm_map_om_PGW_EventList_pdn_connectionCreation, -1, -1, "pdn-connectionCreation", NULL }, + { 1, &hf_gsm_map_om_PGW_EventList_pdn_connectionTermination, -1, -1, "pdn-connectionTermination", NULL }, + { 2, &hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion, -1, -1, "bearerActivationModificationDeletion", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_om_PGW_EventList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_om_PGW_EventList_bits, hf_index, ett_gsm_map_om_PGW_EventList, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_om_TraceEventList_sequence[] = { { &hf_gsm_map_om_msc_s_List_01, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MSC_S_EventList }, { &hf_gsm_map_om_mgw_List_01, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MGW_EventList }, { &hf_gsm_map_om_sgsn_List_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_SGSN_EventList }, { &hf_gsm_map_om_ggsn_List_01, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_GGSN_EventList }, { &hf_gsm_map_om_bmsc_List_01, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_BMSC_EventList }, + { &hf_gsm_map_om_mme_List_01, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_MME_EventList }, + { &hf_gsm_map_om_sgw_List_01, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_SGW_EventList }, + { &hf_gsm_map_om_pgw_List_01, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_PGW_EventList }, { NULL, 0, 0, 0, NULL } }; @@ -6227,6 +6508,7 @@ static const ber_sequence_t gsm_map_om_ActivateTraceModeArg_sequence[] = { { &hf_gsm_map_om_traceNE_TypeList, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceNE_TypeList }, { &hf_gsm_map_om_traceInterfaceList, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceInterfaceList }, { &hf_gsm_map_om_traceEventList, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_om_TraceEventList }, + { &hf_gsm_map_om_traceCollectionEntity, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -6489,41 +6771,6 @@ dissect_gsm_map_ms_VLR_Capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, } - -int -dissect_gsm_map_ms_GSN_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 525 "gsm_map.cnf" - - tvbuff_t *parameter_tvb; - guint8 octet; - proto_tree *subtree; - - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - ¶meter_tvb); - - - if (!parameter_tvb) - return offset; - subtree = proto_item_add_subtree(actx->created_item, ett_gsm_map_pdptypenumber); - - octet = tvb_get_guint8(parameter_tvb,0); - switch(octet){ - case 0x04: /* IPv4 */ - proto_tree_add_item(subtree, hf_gsm_map_GSNAddress_IPv4, parameter_tvb, 1, tvb_length_remaining(parameter_tvb, 1), FALSE); - break; - case 0x50: /* IPv4 */ - proto_tree_add_item(subtree, hf_gsm_map_GSNAddress_IPv4, parameter_tvb, 1, tvb_length_remaining(parameter_tvb, 1), FALSE); - break; - default: - break; - } - - - - return offset; -} - - static const ber_sequence_t gsm_map_ms_ADD_Info_sequence[] = { { &hf_gsm_map_ms_imeisv , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_IMEI }, { &hf_gsm_map_ms_skipSubscriberDataUpdate, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, @@ -6593,7 +6840,7 @@ static const ber_sequence_t gsm_map_ms_UpdateLocationArg_sequence[] = { { &hf_gsm_map_ms_vlr_Capability, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_VLR_Capability }, { &hf_gsm_map_ms_informPreviousNetworkEntity, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_cs_LCS_NotSupportedByUE, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, - { &hf_gsm_map_ms_v_gmlc_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_v_gmlc_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_add_info , BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ADD_Info }, { &hf_gsm_map_ms_pagingArea, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PagingArea }, { &hf_gsm_map_ms_skipSubscriberDataUpdate, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, @@ -6629,6 +6876,7 @@ dissect_gsm_map_ms_UpdateLocationRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U static const value_string gsm_map_ms_CancellationType_vals[] = { { 0, "updateProcedure" }, { 1, "subscriptionWithdraw" }, + { 2, "initialAttachProcedure" }, { 0, NULL } }; @@ -7131,10 +7379,32 @@ dissect_gsm_map_ms_AuthenticationFailureReportRes(gboolean implicit_tag _U_, tvb static const asn_namedbit gsm_map_ms_SupportedFeatures_bits[] = { - { 0, &hf_gsm_map_ms_SupportedFeatures_odb_all, -1, -1, "odb-all", NULL }, + { 0, &hf_gsm_map_ms_SupportedFeatures_odb_all_apn, -1, -1, "odb-all-apn", NULL }, { 1, &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN, -1, -1, "odb-HPLMN-APN", NULL }, { 2, &hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN, -1, -1, "odb-VPLMN-APN", NULL }, - { 3, &hf_gsm_map_ms_SupportedFeatures_regSub, -1, -1, "regSub", NULL }, + { 3, &hf_gsm_map_ms_SupportedFeatures_odb_all_og, -1, -1, "odb-all-og", NULL }, + { 4, &hf_gsm_map_ms_SupportedFeatures_odb_all_international_og, -1, -1, "odb-all-international-og", NULL }, + { 5, &hf_gsm_map_ms_SupportedFeatures_odb_all_int_og_not_to_HPLMN_country, -1, -1, "odb-all-int-og-not-to-HPLMN-country", NULL }, + { 6, &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og, -1, -1, "odb-all-interzonal-og", NULL }, + { 7, &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_not_to_HPLMN_country, -1, -1, "odb-all-interzonal-og-not-to-HPLMN-country", NULL }, + { 8, &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_and_internat_og_not_to_HPLMN_country, -1, -1, "odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country", NULL }, + { 9, &hf_gsm_map_ms_SupportedFeatures_regSub, -1, -1, "regSub", NULL }, + { 10, &hf_gsm_map_ms_SupportedFeatures_trace, -1, -1, "trace", NULL }, + { 11, &hf_gsm_map_ms_SupportedFeatures_lcs_all_PrivExcep, -1, -1, "lcs-all-PrivExcep", NULL }, + { 12, &hf_gsm_map_ms_SupportedFeatures_lcs_universal, -1, -1, "lcs-universal", NULL }, + { 13, &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionRelated, -1, -1, "lcs-CallSessionRelated", NULL }, + { 14, &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionUnrelated, -1, -1, "lcs-CallSessionUnrelated", NULL }, + { 15, &hf_gsm_map_ms_SupportedFeatures_lcs_PLMN_operator, -1, -1, "lcs-PLMN-operator", NULL }, + { 16, &hf_gsm_map_ms_SupportedFeatures_lcs_ServiceType, -1, -1, "lcs-ServiceType", NULL }, + { 17, &hf_gsm_map_ms_SupportedFeatures_lcs_all_MOLR_SS, -1, -1, "lcs-all-MOLR-SS", NULL }, + { 18, &hf_gsm_map_ms_SupportedFeatures_lcs_basicSelfLocation, -1, -1, "lcs-basicSelfLocation", NULL }, + { 19, &hf_gsm_map_ms_SupportedFeatures_lcs_autonomousSelfLocation, -1, -1, "lcs-autonomousSelfLocation", NULL }, + { 20, &hf_gsm_map_ms_SupportedFeatures_lcs_transferToThirdParty, -1, -1, "lcs-transferToThirdParty", NULL }, + { 21, &hf_gsm_map_ms_SupportedFeatures_sm_mo_pp, -1, -1, "sm-mo-pp", NULL }, + { 22, &hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls, -1, -1, "barring-OutgoingCalls", NULL }, + { 23, &hf_gsm_map_ms_SupportedFeatures_baoc, -1, -1, "baoc", NULL }, + { 24, &hf_gsm_map_ms_SupportedFeatures_boic, -1, -1, "boic", NULL }, + { 25, &hf_gsm_map_ms_SupportedFeatures_boicExHC, -1, -1, "boicExHC", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -7248,6 +7518,7 @@ dissect_gsm_map_ms_PDN_GW_Update(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static const asn_namedbit gsm_map_ms_ISR_Information_bits[] = { { 0, &hf_gsm_map_ms_ISR_Information_updateMME, -1, -1, "updateMME", NULL }, { 1, &hf_gsm_map_ms_ISR_Information_cancelSGSN, -1, -1, "cancelSGSN", NULL }, + { 2, &hf_gsm_map_ms_ISR_Information_initialAttachIndicator, -1, -1, "initialAttachIndicator", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -7305,17 +7576,21 @@ dissect_gsm_map_ms_Used_RAT_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i static const ber_sequence_t gsm_map_ms_UpdateGprsLocationArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_ms_sgsn_Number, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, - { &hf_gsm_map_ms_sgsn_Address, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_sgsn_Address, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_GSN_Address }, { &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_sgsn_Capability, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SGSN_Capability }, { &hf_gsm_map_ms_informPreviousNetworkEntity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_ps_LCS_NotSupportedByUE, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, - { &hf_gsm_map_ms_v_gmlc_Address, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_v_gmlc_Address, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_add_info , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ADD_Info }, { &hf_gsm_map_ms_eps_info , BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_ms_EPS_Info }, { &hf_gsm_map_ms_servingNodeTypeIndicator, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_skipSubscriberDataUpdate, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_usedRAT_Type, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Used_RAT_Type }, + { &hf_gsm_map_ms_gprsSubscriptionDataNotNeeded, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_nodeTypeIndicator, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_areaRestricted, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_ue_reachableIndicator, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -9596,6 +9871,26 @@ dissect_gsm_map_ms_Ext3_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb } + +static int +dissect_gsm_map_ms_Ext4_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_ms_APN_OI_Replacement(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 }, @@ -9608,6 +9903,8 @@ static const ber_sequence_t gsm_map_ms_PDP_Context_sequence[] = { { &hf_gsm_map_ms_pdp_ChargingCharacteristics, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ChargingCharacteristics }, { &hf_gsm_map_ms_ext2_QoS_Subscribed, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext2_QoS_Subscribed }, { &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 }, { NULL, 0, 0, 0, NULL } }; @@ -9637,6 +9934,7 @@ static const ber_sequence_t gsm_map_ms_GPRSSubscriptionData_sequence[] = { { &hf_gsm_map_ms_completeDataListIncluded, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_gprsDataList, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GPRSDataList }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_apn_oi_Replacement, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN_OI_Replacement }, { NULL, 0, 0, 0, NULL } }; @@ -10126,16 +10424,6 @@ dissect_gsm_map_ms_AccessRestrictionData(gboolean implicit_tag _U_, tvbuff_t *tv static int -dissect_gsm_map_ms_APN_OI_Replacement(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - - - -static int dissect_gsm_map_ms_RFSP_ID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); @@ -10172,6 +10460,16 @@ dissect_gsm_map_ms_AMBR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int +dissect_gsm_map_ms_PDN_Type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int dissect_gsm_map_ms_QoS_Class_Identifier(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); @@ -10270,16 +10568,19 @@ dissect_gsm_map_ms_SpecificAPNInfoList(gboolean implicit_tag _U_, tvbuff_t *tvb static const ber_sequence_t gsm_map_ms_APN_Configuration_sequence[] = { { &hf_gsm_map_ms_contextId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ContextId }, - { &hf_gsm_map_ms_servedPartyIP_Address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Address }, - { &hf_gsm_map_ms_apn , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN }, - { &hf_gsm_map_ms_eps_qos_Subscribed, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EPS_QoS_Subscribed }, - { &hf_gsm_map_ms_pdn_gw_Identity, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_GW_Identity }, - { &hf_gsm_map_ms_pdn_gw_AllocationType, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_GW_AllocationType }, - { &hf_gsm_map_ms_vplmnAddressAllowed, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, - { &hf_gsm_map_ms_chargingCharacteristics, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ChargingCharacteristics }, - { &hf_gsm_map_ms_ambr , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AMBR }, - { &hf_gsm_map_ms_specificAPNInfoList, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SpecificAPNInfoList }, - { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_pdn_Type , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_Type }, + { &hf_gsm_map_ms_servedPartyIP_IPv4_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Address }, + { &hf_gsm_map_ms_apn , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN }, + { &hf_gsm_map_ms_eps_qos_Subscribed, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EPS_QoS_Subscribed }, + { &hf_gsm_map_ms_pdn_gw_Identity, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_GW_Identity }, + { &hf_gsm_map_ms_pdn_gw_AllocationType, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_GW_AllocationType }, + { &hf_gsm_map_ms_vplmnAddressAllowed, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_chargingCharacteristics, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ChargingCharacteristics }, + { &hf_gsm_map_ms_ambr , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AMBR }, + { &hf_gsm_map_ms_specificAPNInfoList, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SpecificAPNInfoList }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_servedPartyIP_IPv6_Address, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Address }, + { &hf_gsm_map_ms_apn_oi_Replacement, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_APN_OI_Replacement }, { NULL, 0, 0, 0, NULL } }; @@ -10423,6 +10724,7 @@ static const ber_sequence_t gsm_map_ms_InsertSubscriberDataArg_sequence[] = { { &hf_gsm_map_ms_ics_Indicator, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_BOOLEAN }, { &hf_gsm_map_ms_eps_SubscriptionData, BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EPS_SubscriptionData }, { &hf_gsm_map_ms_csg_SubscriptionDataList, BER_CLASS_CON, 32, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CSG_SubscriptionDataList }, + { &hf_gsm_map_ms_ue_ReachabilityRequestIndicator, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -10717,7 +11019,7 @@ dissect_gsm_map_ms_OfferedCamel4Functionalities(gboolean implicit_tag _U_, tvbuf static const ber_sequence_t gsm_map_ms_SendRoutingInfoForGprsArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, - { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_ggsn_Number, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { NULL, 0, 0, 0, NULL } @@ -10733,8 +11035,8 @@ dissect_gsm_map_ms_SendRoutingInfoForGprsArg(gboolean implicit_tag _U_, tvbuff_t static const ber_sequence_t gsm_map_ms_SendRoutingInfoForGprsRes_sequence[] = { - { &hf_gsm_map_ms_sgsn_Address, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, - { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_sgsn_Address, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, + { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_mobileNotReachableReason, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_er_AbsentSubscriberDiagnosticSM }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { NULL, 0, 0, 0, NULL } @@ -10752,7 +11054,7 @@ dissect_gsm_map_ms_SendRoutingInfoForGprsRes(gboolean implicit_tag _U_, tvbuff_t static const ber_sequence_t gsm_map_ms_FailureReportArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_ms_ggsn_Number, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, - { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { NULL, 0, 0, 0, NULL } }; @@ -10767,7 +11069,7 @@ dissect_gsm_map_ms_FailureReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static const ber_sequence_t gsm_map_ms_FailureReportRes_sequence[] = { - { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { NULL, 0, 0, 0, NULL } }; @@ -10783,8 +11085,8 @@ dissect_gsm_map_ms_FailureReportRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static const ber_sequence_t gsm_map_ms_NoteMsPresentForGprsArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, - { &hf_gsm_map_ms_sgsn_Address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, - { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_sgsn_Address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, + { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { NULL, 0, 0, 0, NULL } }; @@ -10945,6 +11247,42 @@ dissect_gsm_map_ms_GeodeticInformation(gboolean implicit_tag _U_, tvbuff_t *tvb } + +static int +dissect_gsm_map_ms_OCTET_STRING_SIZE_7(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_ms_OCTET_STRING_SIZE_6(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_LocationInformationEPS_sequence[] = { + { &hf_gsm_map_ms_e_utranCellGlobalIdentity, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OCTET_STRING_SIZE_7 }, + { &hf_gsm_map_ms_trackingAreaIdentity, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_OCTET_STRING_SIZE_6 }, + { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_map_ms_LocationInformationEPS(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_LocationInformationEPS_sequence, hf_index, ett_gsm_map_ms_LocationInformationEPS); + + 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 }, @@ -10957,6 +11295,7 @@ static const ber_sequence_t gsm_map_ms_LocationInformation_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_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 }, { NULL, 0, 0, 0, NULL } }; @@ -11110,13 +11449,13 @@ static const ber_sequence_t gsm_map_ms_PDP_ContextInfo_sequence[] = { { &hf_gsm_map_ms_transactionId, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_TransactionId }, { &hf_gsm_map_ms_teid_ForGnAndGp, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_TEID }, { &hf_gsm_map_ms_teid_ForIu, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_TEID }, - { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_ggsn_Address, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_qos_Subscribed_01, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_QoS_Subscribed }, { &hf_gsm_map_ms_qos_Requested, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_QoS_Subscribed }, { &hf_gsm_map_ms_qos_Negotiated, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext_QoS_Subscribed }, { &hf_gsm_map_ms_chargingId, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GPRSChargingID }, { &hf_gsm_map_ms_chargingCharacteristics, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ChargingCharacteristics }, - { &hf_gsm_map_ms_rnc_Address, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_ms_rnc_Address, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_ms_qos2_Subscribed, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext2_QoS_Subscribed }, { &hf_gsm_map_ms_qos2_Requested, BER_CLASS_CON, 19, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Ext2_QoS_Subscribed }, @@ -11676,6 +12015,21 @@ dissect_gsm_map_ms_ModificationRequestFor_IP_SM_GW_Data(gboolean implicit_tag _U } +static const asn_namedbit gsm_map_ms_ServingNode_bits[] = { + { 0, &hf_gsm_map_ms_ServingNode_mme, -1, -1, "mme", NULL }, + { 0, NULL, 0, 0, NULL, NULL } +}; + +static int +dissect_gsm_map_ms_ServingNode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_ServingNode_bits, hf_index, ett_gsm_map_ms_ServingNode, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_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 }, @@ -11686,6 +12040,7 @@ static const ber_sequence_t gsm_map_ms_AnyTimeModificationArg_sequence[] = { { &hf_gsm_map_ms_longFTN_Supported, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_modificationRequestFor_ODB_data, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_ODB_data }, { &hf_gsm_map_ms_modificationRequestFor_IP_SM_GW_Data, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ModificationRequestFor_IP_SM_GW_Data }, + { &hf_gsm_map_ms_activationRequestForUE_reachability, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ServingNode }, { NULL, 0, 0, 0, NULL } }; @@ -11782,6 +12137,7 @@ static const ber_sequence_t gsm_map_ms_NoteSubscriberDataModifiedArg_sequence[] { &hf_gsm_map_ms_camel_SubscriptionInfo, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_CAMEL_SubscriptionInfo }, { &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 }, { NULL, 0, 0, 0, NULL } }; @@ -12740,10 +13096,10 @@ static const ber_sequence_t gsm_map_lcs_RoutingInfoForLCS_Res_sequence[] = { { &hf_gsm_map_lcs_targetMS, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_SubscriberIdentity }, { &hf_gsm_map_lcs_lcsLocationInfo, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCSLocationInfo }, { &hf_gsm_map_lcs_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, - { &hf_gsm_map_lcs_v_gmlc_Address, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, - { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, - { &hf_gsm_map_lcs_ppr_Address, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, - { &hf_gsm_map_lcs_additional_v_gmlc_Address, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_lcs_v_gmlc_Address, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, + { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, + { &hf_gsm_map_lcs_ppr_Address, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, + { &hf_gsm_map_lcs_additional_v_gmlc_Address, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -13312,7 +13668,7 @@ static const ber_sequence_t gsm_map_lcs_ProvideSubscriberLocation_Arg_sequence[] { &hf_gsm_map_lcs_lcsCodeword, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCSCodeword }, { &hf_gsm_map_lcs_lcs_PrivacyCheck, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_PrivacyCheck }, { &hf_gsm_map_lcs_areaEventInfo, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_AreaEventInfo }, - { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_lcs_mo_lrShortCircuitIndicator, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_NULL }, { &hf_gsm_map_lcs_periodicLDRInfo, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_PeriodicLDRInfo }, { &hf_gsm_map_lcs_reportingPLMNList, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_ReportingPLMNList }, @@ -13519,7 +13875,7 @@ static const ber_sequence_t gsm_map_lcs_SubscriberLocationReport_Arg_sequence[] { &hf_gsm_map_lcs_geranPositioningData, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_PositioningDataInformation }, { &hf_gsm_map_lcs_utranPositioningData, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_UtranPositioningDataInfo }, { &hf_gsm_map_lcs_cellIdOrSai, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_CellGlobalIdOrServiceAreaIdOrLAI }, - { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_lcs_lcsServiceTypeID, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_LCSServiceTypeID }, { &hf_gsm_map_lcs_sai_Present, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_NULL }, { &hf_gsm_map_lcs_pseudonymIndicator, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_NULL }, @@ -13544,7 +13900,7 @@ static const ber_sequence_t gsm_map_lcs_SubscriberLocationReport_Res_sequence[] { &hf_gsm_map_lcs_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_lcs_na_ESRK , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_lcs_na_ESRD , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, - { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_map_lcs_h_gmlc_Address, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_map_lcs_mo_lrShortCircuitIndicator, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_NULL }, { &hf_gsm_map_lcs_reportingPLMNList, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_ReportingPLMNList }, { &hf_gsm_map_lcs_lcs_ReferenceNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, @@ -15396,6 +15752,22 @@ dissect_gsm_old_SendRoutingInfoResV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U } +static const ber_sequence_t gsm_old_BeginSubscriberActivityArg_sequence[] = { + { &hf_gsm_old_imsi , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_IMSI }, + { &hf_gsm_old_originatingEntityNumber, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_old_msisdn_02 , BER_CLASS_PRI, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString }, + { NULL, 0, 0, 0, NULL } +}; + +static int +dissect_gsm_old_BeginSubscriberActivityArg(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_old_BeginSubscriberActivityArg_sequence, hf_index, ett_gsm_old_BeginSubscriberActivityArg); + + return offset; +} + + /* --- Module SS-DataTypes --- --- --- */ @@ -15625,22 +15997,6 @@ dissect_gsm_ss_NotifySS_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const ber_sequence_t gsm_ss_BeginSubscriberActivityArg_sequence[] = { - { &hf_gsm_ss_imsi , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_IMSI }, - { &hf_gsm_ss_originatingEntityNumber, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, - { &hf_gsm_ss_msisdn , BER_CLASS_PRI, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AddressString }, - { NULL, 0, 0, 0, NULL } -}; - -static int -dissect_gsm_ss_BeginSubscriberActivityArg(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_ss_BeginSubscriberActivityArg_sequence, hf_index, ett_gsm_ss_BeginSubscriberActivityArg); - - return offset; -} - - static int dissect_gsm_ss_E1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -15970,7 +16326,7 @@ static const ber_sequence_t gsm_ss_LCS_MOLRArg_sequence[] = { { &hf_gsm_ss_ageOfLocationInfo, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_AgeOfLocationInformation }, { &hf_gsm_ss_locationType , BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LocationType }, { &hf_gsm_ss_pseudonymIndicator, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_NULL }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_ss_locationEstimate, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_Ext_GeographicalInformation }, { &hf_gsm_ss_velocityEstimate, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_VelocityEstimate }, { &hf_gsm_ss_referenceNumber, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, @@ -16008,7 +16364,7 @@ static const ber_sequence_t gsm_ss_LCS_MOLRRes_sequence[] = { { &hf_gsm_ss_add_LocationEstimate, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_Add_GeographicalInformation }, { &hf_gsm_ss_velocityEstimate, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_VelocityEstimate }, { &hf_gsm_ss_referenceNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_ss_mo_lrShortCircuit, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_NULL }, { &hf_gsm_ss_reportingPLMNList, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_ReportingPLMNList }, { NULL, 0, 0, 0, NULL } @@ -16025,7 +16381,7 @@ dissect_gsm_ss_LCS_MOLRRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static const ber_sequence_t gsm_ss_LCS_AreaEventRequestArg_sequence[] = { { &hf_gsm_ss_referenceNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_ss_deferredLocationEventType, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_DeferredLocationEventType }, { &hf_gsm_ss_areaEventInfo, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_AreaEventInfo }, { NULL, 0, 0, 0, NULL } @@ -16042,7 +16398,7 @@ dissect_gsm_ss_LCS_AreaEventRequestArg(gboolean implicit_tag _U_, tvbuff_t *tvb static const ber_sequence_t gsm_ss_LCS_AreaEventReportArg_sequence[] = { { &hf_gsm_ss_referenceNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -16057,7 +16413,7 @@ dissect_gsm_ss_LCS_AreaEventReportArg(gboolean implicit_tag _U_, tvbuff_t *tvb _ static const ber_sequence_t gsm_ss_LCS_AreaEventCancellationArg_sequence[] = { { &hf_gsm_ss_referenceNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -16075,7 +16431,7 @@ static const ber_sequence_t gsm_ss_LCS_PeriodicLocationRequestArg_sequence[] = { { &hf_gsm_ss_periodicLDRInfo, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_PeriodicLDRInfo }, { &hf_gsm_ss_lcsClientExternalID, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_gsm_map_LCSClientExternalID }, { &hf_gsm_ss_qoS , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_QoS }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { &hf_gsm_ss_mo_lrShortCircuit, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_ss_NULL }, { &hf_gsm_ss_reportingPLMNList, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_ReportingPLMNList }, { NULL, 0, 0, 0, NULL } @@ -16137,7 +16493,7 @@ dissect_gsm_ss_LCS_LocationUpdateRes(gboolean implicit_tag _U_, tvbuff_t *tvb _U static const ber_sequence_t gsm_ss_LCS_PeriodicLocationCancellationArg_sequence[] = { { &hf_gsm_ss_referenceNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_lcs_LCS_ReferenceNumber }, - { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_GSN_Address }, + { &hf_gsm_ss_h_gmlc_address, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_GSN_Address }, { NULL, 0, 0, 0, NULL } }; @@ -16345,7 +16701,6 @@ const value_string gsm_map_opr_code_strings[] = { /* --- Module SS-Operations --- --- --- */ { 19, "processUnstructuredSS_Data" }, - { 54, "beginSubscriberActivity" }, { 16, "notifySS" }, { 125, "forwardChargeAdvice" }, { 120, "forwardCUG_Info" }, @@ -16551,7 +16906,6 @@ static const value_string gsm_map_err_code_string_vals[] = { /* --- Module SS-Operations --- --- --- */ { 19, "processUnstructuredSS_Data" }, - { 54, "beginSubscriberActivity" }, { 16, "notifySS" }, { 125, "forwardChargeAdvice" }, { 120, "forwardCUG_Info" }, @@ -16893,7 +17247,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ /* reserved traceSubscriberActivity (52) */ /* undefined 53 */ case 54: /*beginSubscriberActivity*/ - offset=dissect_gsm_ss_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1); + offset=dissect_gsm_old_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1); break; case 55: /*sendIdentification*/ offset=dissect_mc_message(tvb, offset, actx, tree, @@ -18946,6 +19300,10 @@ void proto_register_gsm_map(void) { { "traceEventList", "gsm_map.om.traceEventList", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_om.TraceEventList", HFILL }}, + { &hf_gsm_map_om_traceCollectionEntity, + { "traceCollectionEntity", "gsm_map.om.traceCollectionEntity", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_om_msc_s_TraceDepth, { "msc-s-TraceDepth", "gsm_map.om.msc_s_TraceDepth", FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, @@ -18970,6 +19328,22 @@ void proto_register_gsm_map(void) { { "bmsc-TraceDepth", "gsm_map.om.bmsc_TraceDepth", FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, "gsm_map_om.TraceDepth", HFILL }}, + { &hf_gsm_map_om_mme_TraceDepth, + { "mme-TraceDepth", "gsm_map.om.mme_TraceDepth", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, + "gsm_map_om.TraceDepth", HFILL }}, + { &hf_gsm_map_om_sgw_TraceDepth, + { "sgw-TraceDepth", "gsm_map.om.sgw_TraceDepth", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, + "gsm_map_om.TraceDepth", HFILL }}, + { &hf_gsm_map_om_pgw_TraceDepth, + { "pgw-TraceDepth", "gsm_map.om.pgw_TraceDepth", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, + "gsm_map_om.TraceDepth", HFILL }}, + { &hf_gsm_map_om_eNB_TraceDepth, + { "eNB-TraceDepth", "gsm_map.om.eNB_TraceDepth", + FT_UINT32, BASE_DEC, VALS(gsm_map_om_TraceDepth_vals), 0, + "gsm_map_om.TraceDepth", HFILL }}, { &hf_gsm_map_om_msc_s_List, { "msc-s-List", "gsm_map.om.msc_s_List", FT_BYTES, BASE_NONE, NULL, 0, @@ -18994,6 +19368,22 @@ void proto_register_gsm_map(void) { { "bmsc-List", "gsm_map.om.bmsc_List", FT_BYTES, BASE_NONE, NULL, 0, "gsm_map_om.BMSC_InterfaceList", HFILL }}, + { &hf_gsm_map_om_mme_List, + { "mme-List", "gsm_map.om.mme_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.MME_InterfaceList", HFILL }}, + { &hf_gsm_map_om_sgw_List, + { "sgw-List", "gsm_map.om.sgw_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.SGW_InterfaceList", HFILL }}, + { &hf_gsm_map_om_pgw_List, + { "pgw-List", "gsm_map.om.pgw_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.PGW_InterfaceList", HFILL }}, + { &hf_gsm_map_om_eNB_List, + { "eNB-List", "gsm_map.om.eNB_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.ENB_InterfaceList", HFILL }}, { &hf_gsm_map_om_msc_s_List_01, { "msc-s-List", "gsm_map.om.msc_s_List", FT_BYTES, BASE_NONE, NULL, 0, @@ -19014,6 +19404,18 @@ void proto_register_gsm_map(void) { { "bmsc-List", "gsm_map.om.bmsc_List", FT_BYTES, BASE_NONE, NULL, 0, "gsm_map_om.BMSC_EventList", HFILL }}, + { &hf_gsm_map_om_mme_List_01, + { "mme-List", "gsm_map.om.mme_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.MME_EventList", HFILL }}, + { &hf_gsm_map_om_sgw_List_01, + { "sgw-List", "gsm_map.om.sgw_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.SGW_EventList", HFILL }}, + { &hf_gsm_map_om_pgw_List_01, + { "pgw-List", "gsm_map.om.pgw_List", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_om.PGW_EventList", HFILL }}, { &hf_gsm_map_om_traceRecordingSessionReference, { "traceRecordingSessionReference", "gsm_map.om.traceRecordingSessionReference", FT_BYTES, BASE_NONE, NULL, 0, @@ -19066,6 +19468,22 @@ void proto_register_gsm_map(void) { { "bm-sc", "gsm_map.om.bm-sc", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, + { &hf_gsm_map_om_TraceNE_TypeList_mme, + { "mme", "gsm_map.om.mme", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_om_TraceNE_TypeList_sgw, + { "sgw", "gsm_map.om.sgw", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_gsm_map_om_TraceNE_TypeList_pgw, + { "pgw", "gsm_map.om.pgw", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_TraceNE_TypeList_eNB, + { "eNB", "gsm_map.om.eNB", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_gsm_map_om_MSC_S_InterfaceList_a, { "a", "gsm_map.om.a", FT_BOOLEAN, 8, NULL, 0x80, @@ -19150,6 +19568,18 @@ void proto_register_gsm_map(void) { { "ge", "gsm_map.om.ge", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, + { &hf_gsm_map_om_SGSN_InterfaceList_s3, + { "s3", "gsm_map.om.s3", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_SGSN_InterfaceList_s4, + { "s4", "gsm_map.om.s4", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_SGSN_InterfaceList_s6d, + { "s6d", "gsm_map.om.s6d", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, { &hf_gsm_map_om_GGSN_InterfaceList_gn, { "gn", "gsm_map.om.gn", FT_BOOLEAN, 8, NULL, 0x80, @@ -19182,6 +19612,90 @@ void proto_register_gsm_map(void) { { "gmb", "gsm_map.om.gmb", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_gsm_map_om_MME_InterfaceList_s1_mme, + { "s1-mme", "gsm_map.om.s1-mme", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_InterfaceList_s3, + { "s3", "gsm_map.om.s3", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_InterfaceList_s6a, + { "s6a", "gsm_map.om.s6a", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_InterfaceList_s10, + { "s10", "gsm_map.om.s10", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_InterfaceList_s11, + { "s11", "gsm_map.om.s11", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_InterfaceList_s4, + { "s4", "gsm_map.om.s4", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_InterfaceList_s5, + { "s5", "gsm_map.om.s5", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_InterfaceList_s8b, + { "s8b", "gsm_map.om.s8b", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_InterfaceList_s11, + { "s11", "gsm_map.om.s11", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_InterfaceList_gxc, + { "gxc", "gsm_map.om.gxc", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_s2a, + { "s2a", "gsm_map.om.s2a", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_s2b, + { "s2b", "gsm_map.om.s2b", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_s2c, + { "s2c", "gsm_map.om.s2c", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_s5, + { "s5", "gsm_map.om.s5", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_s6b, + { "s6b", "gsm_map.om.s6b", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_gx, + { "gx", "gsm_map.om.gx", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_s8b, + { "s8b", "gsm_map.om.s8b", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_InterfaceList_sgi, + { "sgi", "gsm_map.om.sgi", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_gsm_map_om_ENB_InterfaceList_s1_mme, + { "s1-mme", "gsm_map.om.s1-mme", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_ENB_InterfaceList_x2, + { "x2", "gsm_map.om.x2", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_ENB_InterfaceList_uu, + { "uu", "gsm_map.om.uu", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, { &hf_gsm_map_om_MSC_S_EventList_mo_mtCall, { "mo-mtCall", "gsm_map.om.mo-mtCall", FT_BOOLEAN, 8, NULL, 0x80, @@ -19234,6 +19748,54 @@ void proto_register_gsm_map(void) { { "mbmsMulticastServiceActivation", "gsm_map.om.mbmsMulticastServiceActivation", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, + { &hf_gsm_map_om_MME_EventList_ue_initiatedPDNconectivityRequest, + { "ue-initiatedPDNconectivityRequest", "gsm_map.om.ue-initiatedPDNconectivityRequest", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_EventList_serviceRequestts, + { "serviceRequestts", "gsm_map.om.serviceRequestts", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_EventList_initialAttachTrackingAreaUpdateDetach, + { "initialAttachTrackingAreaUpdateDetach", "gsm_map.om.initialAttachTrackingAreaUpdateDetach", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_EventList_ue_initiatedPDNdisconnection, + { "ue-initiatedPDNdisconnection", "gsm_map.om.ue-initiatedPDNdisconnection", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_EventList_bearerActivationModificationDeletion, + { "bearerActivationModificationDeletion", "gsm_map.om.bearerActivationModificationDeletion", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_om_MME_EventList_handover, + { "handover", "gsm_map.om.handover", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_EventList_pdn_connectionCreation, + { "pdn-connectionCreation", "gsm_map.om.pdn-connectionCreation", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_EventList_pdn_connectionTermination, + { "pdn-connectionTermination", "gsm_map.om.pdn-connectionTermination", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_SGW_EventList_bearerActivationModificationDeletion, + { "bearerActivationModificationDeletion", "gsm_map.om.bearerActivationModificationDeletion", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_EventList_pdn_connectionCreation, + { "pdn-connectionCreation", "gsm_map.om.pdn-connectionCreation", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_EventList_pdn_connectionTermination, + { "pdn-connectionTermination", "gsm_map.om.pdn-connectionTermination", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_om_PGW_EventList_bearerActivationModificationDeletion, + { "bearerActivationModificationDeletion", "gsm_map.om.bearerActivationModificationDeletion", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, /* --- Module MAP-MS-DataTypes --- --- --- */ @@ -19272,7 +19834,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ms_v_gmlc_Address, { "v-gmlc-Address", "gsm_map.ms.v_gmlc_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_ms_add_info, { "add-info", "gsm_map.ms.add_info", FT_NONE, BASE_NONE, NULL, 0, @@ -19488,7 +20050,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ms_sgsn_Address, { "sgsn-Address", "gsm_map.ms.sgsn_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_ms_sgsn_Capability, { "sgsn-Capability", "gsm_map.ms.sgsn_Capability", FT_NONE, BASE_NONE, NULL, 0, @@ -19509,6 +20071,22 @@ void proto_register_gsm_map(void) { { "usedRAT-Type", "gsm_map.ms.usedRAT_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_gprsSubscriptionDataNotNeeded, + { "gprsSubscriptionDataNotNeeded", "gsm_map.ms.gprsSubscriptionDataNotNeeded", + FT_NONE, BASE_NONE, NULL, 0, + "gsm_map_ms.NULL", HFILL }}, + { &hf_gsm_map_ms_nodeTypeIndicator, + { "nodeTypeIndicator", "gsm_map.ms.nodeTypeIndicator", + FT_NONE, BASE_NONE, NULL, 0, + "gsm_map_ms.NULL", HFILL }}, + { &hf_gsm_map_ms_areaRestricted, + { "areaRestricted", "gsm_map.ms.areaRestricted", + FT_NONE, BASE_NONE, NULL, 0, + "gsm_map_ms.NULL", HFILL }}, + { &hf_gsm_map_ms_ue_reachableIndicator, + { "ue-reachableIndicator", "gsm_map.ms.ue_reachableIndicator", + FT_NONE, BASE_NONE, NULL, 0, + "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_pdn_gw_update, { "pdn-gw-update", "gsm_map.ms.pdn_gw_update", FT_NONE, BASE_NONE, NULL, 0, @@ -19881,8 +20459,12 @@ void proto_register_gsm_map(void) { { "APN-Configuration", "gsm_map.ms.APN_Configuration", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.APN_Configuration", HFILL }}, - { &hf_gsm_map_ms_servedPartyIP_Address, - { "servedPartyIP-Address", "gsm_map.ms.servedPartyIP_Address", + { &hf_gsm_map_ms_pdn_Type, + { "pdn-Type", "gsm_map.ms.pdn_Type", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_ms.PDN_Type", HFILL }}, + { &hf_gsm_map_ms_servedPartyIP_IPv4_Address, + { "servedPartyIP-IPv4-Address", "gsm_map.ms.servedPartyIP_IPv4_Address", FT_BYTES, BASE_NONE, NULL, 0, "gsm_map_ms.PDP_Address", HFILL }}, { &hf_gsm_map_ms_eps_qos_Subscribed, @@ -19905,6 +20487,10 @@ void proto_register_gsm_map(void) { { "specificAPNInfoList", "gsm_map.ms.specificAPNInfoList", FT_UINT32, BASE_DEC, NULL, 0, "gsm_map_ms.SpecificAPNInfoList", HFILL }}, + { &hf_gsm_map_ms_servedPartyIP_IPv6_Address, + { "servedPartyIP-IPv6-Address", "gsm_map.ms.servedPartyIP_IPv6_Address", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_ms.PDP_Address", HFILL }}, { &hf_gsm_map_ms_qos_Class_Identifier, { "qos-Class-Identifier", "gsm_map.ms.qos_Class_Identifier", FT_UINT32, BASE_DEC, NULL, 0, @@ -20005,6 +20591,10 @@ void proto_register_gsm_map(void) { { "ext3-QoS-Subscribed", "gsm_map.ms.ext3_QoS_Subscribed", FT_BYTES, BASE_NONE, NULL, 0, "gsm_map_ms.Ext3_QoS_Subscribed", HFILL }}, + { &hf_gsm_map_ms_ext4_QoS_Subscribed, + { "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_gprsDataList, { "gprsDataList", "gsm_map.ms.gprsDataList", FT_UINT32, BASE_DEC, NULL, 0, @@ -20628,7 +21218,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ms_ggsn_Address, { "ggsn-Address", "gsm_map.ms.ggsn_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_ms_ggsn_Number, { "ggsn-Number", "gsm_map.ms.ggsn_Number", FT_BYTES, BASE_NONE, NULL, 0, @@ -20797,6 +21387,18 @@ 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", + FT_NONE, BASE_NONE, NULL, 0, + "gsm_map_ms.LocationInformationEPS", HFILL }}, + { &hf_gsm_map_ms_e_utranCellGlobalIdentity, + { "e-utranCellGlobalIdentity", "gsm_map.ms.e_utranCellGlobalIdentity", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_ms.OCTET_STRING_SIZE_7", HFILL }}, + { &hf_gsm_map_ms_trackingAreaIdentity, + { "trackingAreaIdentity", "gsm_map.ms.trackingAreaIdentity", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_ms.OCTET_STRING_SIZE_6", HFILL }}, { &hf_gsm_map_ms_routeingAreaIdentity, { "routeingAreaIdentity", "gsm_map.ms.routeingAreaIdentity", FT_BYTES, BASE_NONE, NULL, 0, @@ -20900,7 +21502,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_ms_rnc_Address, { "rnc-Address", "gsm_map.ms.rnc_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_ms_qos2_Subscribed, { "qos2-Subscribed", "gsm_map.ms.qos2_Subscribed", FT_BYTES, BASE_NONE, NULL, 0, @@ -21065,6 +21667,10 @@ void proto_register_gsm_map(void) { { "modificationRequestFor-IP-SM-GW-Data", "gsm_map.ms.modificationRequestFor_IP_SM_GW_Data", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.ModificationRequestFor_IP_SM_GW_Data", HFILL }}, + { &hf_gsm_map_ms_activationRequestForUE_reachability, + { "activationRequestForUE-reachability", "gsm_map.ms.activationRequestForUE_reachability", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_ms.ServingNode", 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, @@ -21105,6 +21711,10 @@ void proto_register_gsm_map(void) { { "allInformationSent", "gsm_map.ms.allInformationSent", FT_NONE, BASE_NONE, NULL, 0, "gsm_map_ms.NULL", HFILL }}, + { &hf_gsm_map_ms_ue_reachable, + { "ue-reachable", "gsm_map.ms.ue_reachable", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map_ms.ServingNode", HFILL }}, { &hf_gsm_map_ms_eventMet, { "eventMet", "gsm_map.ms.eventMet", FT_BYTES, BASE_NONE, NULL, 0, @@ -21181,6 +21791,10 @@ void proto_register_gsm_map(void) { { "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, + "gsm_map_ms.NULL", HFILL }}, { &hf_gsm_map_ms_SupportedRAT_Types_utran, { "utran", "gsm_map.ms.utran", FT_BOOLEAN, 8, NULL, 0x80, @@ -21229,8 +21843,12 @@ void proto_register_gsm_map(void) { { "cancelSGSN", "gsm_map.ms.cancelSGSN", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - { &hf_gsm_map_ms_SupportedFeatures_odb_all, - { "odb-all", "gsm_map.ms.odb-all", + { &hf_gsm_map_ms_ISR_Information_initialAttachIndicator, + { "initialAttachIndicator", "gsm_map.ms.initialAttachIndicator", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_apn, + { "odb-all-apn", "gsm_map.ms.odb-all-apn", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }}, { &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN, @@ -21241,10 +21859,98 @@ void proto_register_gsm_map(void) { { "odb-VPLMN-APN", "gsm_map.ms.odb-VPLMN-APN", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_og, + { "odb-all-og", "gsm_map.ms.odb-all-og", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_international_og, + { "odb-all-international-og", "gsm_map.ms.odb-all-international-og", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_int_og_not_to_HPLMN_country, + { "odb-all-int-og-not-to-HPLMN-country", "gsm_map.ms.odb-all-int-og-not-to-HPLMN-country", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og, + { "odb-all-interzonal-og", "gsm_map.ms.odb-all-interzonal-og", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_not_to_HPLMN_country, + { "odb-all-interzonal-og-not-to-HPLMN-country", "gsm_map.ms.odb-all-interzonal-og-not-to-HPLMN-country", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_odb_all_interzonal_og_and_internat_og_not_to_HPLMN_country, + { "odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country", "gsm_map.ms.odb-all-interzonal-og-and-internat-og-not-to-HPLMN-country", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, { &hf_gsm_map_ms_SupportedFeatures_regSub, { "regSub", "gsm_map.ms.regSub", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_trace, + { "trace", "gsm_map.ms.trace", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_all_PrivExcep, + { "lcs-all-PrivExcep", "gsm_map.ms.lcs-all-PrivExcep", + FT_BOOLEAN, 8, NULL, 0x10, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_universal, + { "lcs-universal", "gsm_map.ms.lcs-universal", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionRelated, + { "lcs-CallSessionRelated", "gsm_map.ms.lcs-CallSessionRelated", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_CallSessionUnrelated, + { "lcs-CallSessionUnrelated", "gsm_map.ms.lcs-CallSessionUnrelated", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_PLMN_operator, + { "lcs-PLMN-operator", "gsm_map.ms.lcs-PLMN-operator", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_ServiceType, + { "lcs-ServiceType", "gsm_map.ms.lcs-ServiceType", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_all_MOLR_SS, + { "lcs-all-MOLR-SS", "gsm_map.ms.lcs-all-MOLR-SS", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_basicSelfLocation, + { "lcs-basicSelfLocation", "gsm_map.ms.lcs-basicSelfLocation", + FT_BOOLEAN, 8, NULL, 0x20, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_autonomousSelfLocation, + { "lcs-autonomousSelfLocation", "gsm_map.ms.lcs-autonomousSelfLocation", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_lcs_transferToThirdParty, + { "lcs-transferToThirdParty", "gsm_map.ms.lcs-transferToThirdParty", + FT_BOOLEAN, 8, NULL, 0x08, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_sm_mo_pp, + { "sm-mo-pp", "gsm_map.ms.sm-mo-pp", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_barring_OutgoingCalls, + { "barring-OutgoingCalls", "gsm_map.ms.barring-OutgoingCalls", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_baoc, + { "baoc", "gsm_map.ms.baoc", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_boic, + { "boic", "gsm_map.ms.boic", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_boicExHC, + { "boicExHC", "gsm_map.ms.boicExHC", + FT_BOOLEAN, 8, NULL, 0x40, + NULL, HFILL }}, { &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus, { "equipmentStatus", "gsm_map.ms.equipmentStatus", FT_BOOLEAN, 8, NULL, 0x80, @@ -21601,6 +22307,10 @@ void proto_register_gsm_map(void) { { "emergencyReset", "gsm_map.ms.emergencyReset", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }}, + { &hf_gsm_map_ms_ServingNode_mme, + { "mme", "gsm_map.ms.mme", + FT_BOOLEAN, 8, NULL, 0x80, + NULL, HFILL }}, /* --- Module MAP-CH-DataTypes --- --- --- */ @@ -22046,19 +22756,19 @@ void proto_register_gsm_map(void) { { &hf_gsm_map_lcs_v_gmlc_Address, { "v-gmlc-Address", "gsm_map.lcs.v_gmlc_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_lcs_h_gmlc_Address, { "h-gmlc-Address", "gsm_map.lcs.h_gmlc_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_lcs_ppr_Address, { "ppr-Address", "gsm_map.lcs.ppr_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_lcs_additional_v_gmlc_Address, { "additional-v-gmlc-Address", "gsm_map.lcs.additional_v_gmlc_Address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_map_lcs_networkNode_Number, { "networkNode-Number", "gsm_map.lcs.networkNode_Number", FT_BYTES, BASE_NONE, NULL, 0, @@ -22964,6 +23674,14 @@ void proto_register_gsm_map(void) { { "routingInfo", "gsm_old.routingInfo", FT_UINT32, BASE_DEC, VALS(gsm_map_ch_RoutingInfo_vals), 0, "gsm_map_ch.RoutingInfo", HFILL }}, + { &hf_gsm_old_originatingEntityNumber, + { "originatingEntityNumber", "gsm_old.originatingEntityNumber", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map.ISDN_AddressString", HFILL }}, + { &hf_gsm_old_msisdn_02, + { "msisdn", "gsm_old.msisdn", + FT_BYTES, BASE_NONE, NULL, 0, + "gsm_map.AddressString", HFILL }}, /* --- Module SS-DataTypes --- --- --- */ @@ -23019,18 +23737,6 @@ void proto_register_gsm_map(void) { { "multicall-Indicator", "gsm_ss.multicall_Indicator", FT_UINT32, BASE_DEC, VALS(gsm_ss_Multicall_Indicator_vals), 0, "gsm_ss.Multicall_Indicator", HFILL }}, - { &hf_gsm_ss_imsi, - { "imsi", "gsm_ss.imsi", - FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map.IMSI", HFILL }}, - { &hf_gsm_ss_originatingEntityNumber, - { "originatingEntityNumber", "gsm_ss.originatingEntityNumber", - FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map.ISDN_AddressString", HFILL }}, - { &hf_gsm_ss_msisdn, - { "msisdn", "gsm_ss.msisdn", - FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map.AddressString", HFILL }}, { &hf_gsm_ss_chargingInformation, { "chargingInformation", "gsm_ss.chargingInformation", FT_NONE, BASE_NONE, NULL, 0, @@ -23214,7 +23920,7 @@ void proto_register_gsm_map(void) { { &hf_gsm_ss_h_gmlc_address, { "h-gmlc-address", "gsm_ss.h_gmlc_address", FT_BYTES, BASE_NONE, NULL, 0, - "gsm_map_ms.GSN_Address", HFILL }}, + "gsm_map.GSN_Address", HFILL }}, { &hf_gsm_ss_locationEstimate, { "locationEstimate", "gsm_ss.locationEstimate", FT_BYTES, BASE_NONE, NULL, 0, @@ -23452,12 +24158,19 @@ void proto_register_gsm_map(void) { &ett_gsm_map_om_GGSN_InterfaceList, &ett_gsm_map_om_RNC_InterfaceList, &ett_gsm_map_om_BMSC_InterfaceList, + &ett_gsm_map_om_MME_InterfaceList, + &ett_gsm_map_om_SGW_InterfaceList, + &ett_gsm_map_om_PGW_InterfaceList, + &ett_gsm_map_om_ENB_InterfaceList, &ett_gsm_map_om_TraceEventList, &ett_gsm_map_om_MSC_S_EventList, &ett_gsm_map_om_MGW_EventList, &ett_gsm_map_om_SGSN_EventList, &ett_gsm_map_om_GGSN_EventList, &ett_gsm_map_om_BMSC_EventList, + &ett_gsm_map_om_MME_EventList, + &ett_gsm_map_om_SGW_EventList, + &ett_gsm_map_om_PGW_EventList, &ett_gsm_map_om_TracePropagationList, &ett_gsm_map_om_ActivateTraceModeRes, &ett_gsm_map_om_DeactivateTraceModeArg, @@ -23649,6 +24362,7 @@ void proto_register_gsm_map(void) { &ett_gsm_map_ms_GPRSMSClass, &ett_gsm_map_ms_RequestedInfo, &ett_gsm_map_ms_LocationInformation, + &ett_gsm_map_ms_LocationInformationEPS, &ett_gsm_map_ms_LocationInformationGPRS, &ett_gsm_map_ms_SubscriberState, &ett_gsm_map_ms_PS_SubscriberState, @@ -23666,6 +24380,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_ServingNode, &ett_gsm_map_ms_AnyTimeModificationRes, &ett_gsm_map_ms_ModificationRequestFor_CF_Info, &ett_gsm_map_ms_ModificationRequestFor_CB_Info, @@ -23832,11 +24547,11 @@ void proto_register_gsm_map(void) { &ett_gsm_old_SM_RP_OAold, &ett_gsm_old_SendRoutingInfoArgV2, &ett_gsm_old_SendRoutingInfoResV2, + &ett_gsm_old_BeginSubscriberActivityArg, /* --- Module SS-DataTypes --- --- --- */ &ett_gsm_ss_NotifySS_Arg, - &ett_gsm_ss_BeginSubscriberActivityArg, &ett_gsm_ss_ForwardChargeAdviceArg, &ett_gsm_ss_ChargingInformation, &ett_gsm_ss_ForwardCUG_InfoArg, diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index 13ec477232..1fd1affbf4 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -82,6 +82,7 @@ int dissect_gsm_map_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissect_gsm_map_ISDN_AddressString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ISDN_SubaddressString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_AlertingPattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +int dissect_gsm_map_GSN_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_IMSI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_IMEI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_GlobalCellId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); @@ -114,7 +115,6 @@ int dissect_gsm_map_ss_EraseCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb extern const value_string gsm_map_ms_NotificationToMSUser_vals[]; extern const value_string gsm_map_ms_SubscriberState_vals[]; -int dissect_gsm_map_ms_GSN_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_Ext_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_gsm_map_ms_Ext2_QoS_Subscribed(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); |