diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2017-04-13 16:59:22 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-04-13 16:40:11 +0000 |
| commit | 0c597f111ffaacd12c1f1e46c0bfddcdfdec5b02 (patch) | |
| tree | a27deac11fdedd67cdd5985b023ff239d396ab79 | |
| parent | 4e56c063b462837202d6c37adbdc4c0726a25024 (diff) | |
[GSM MAP] Update to 3GPP TS 29.002 V14.3.0 (2017-03).
Change-Id: I97a4ee7cdcb8644a4f2e3f108842d4c28d788c54
Reviewed-on: https://code.wireshark.org/review/21076
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
29 files changed, 515 insertions, 193 deletions
diff --git a/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn b/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn index fac0720c9e..8b4a35de98 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ApplicationContexts.asn @@ -1,10 +1,10 @@ --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 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) MAP-ApplicationContexts { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ApplicationContexts (2) version16 (16)} + gsm-Network (1) modules (3) map-ApplicationContexts (2) version17 (17)} DEFINITIONS diff --git a/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn index bb8cc76b3a..bdacc4bc86 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-BS-Code.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.10 Bearer Service Codes MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version16 (16)} + gsm-Network (1) modules (3) map-BS-Code (20) version17 (17)} DEFINITIONS diff --git a/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn index 1705740d43..f793d802e8 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CH-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.3 Call handling data types MAP-CH-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CH-DataTypes (13) version16 (16)} + gsm-Network (1) modules (3) map-CH-DataTypes (13) version17 (17)} DEFINITIONS @@ -35,10 +35,10 @@ EXPORTS IST-CommandRes, UU-Data, ReleaseResourcesArg, -ReleaseResourcesRes, ---- WS added exports needed by gsm_map.asn (extra asn1 file to handle older protocol versions) +-- WS added exports needed by gsm_map.asn (extra asn1 file to handle older protocol versions) RoutingInfo, -CUG-CheckInfo +CUG-CheckInfo, +ReleaseResourcesRes ; IMPORTS @@ -57,14 +57,14 @@ IMPORTS PagingArea FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version16 (16)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version17 (17)} ForwardingOptions, SS-List, CCBS-Feature FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version16 (16)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version17 (17)} ISDN-AddressString, ISDN-SubaddressString, @@ -80,12 +80,12 @@ FROM MAP-SS-DataTypes { PLMN-Id FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn index a2de091991..3e7f2c5e89 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CallHandlingOperations.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) --17.6.3 Call Handling Operations MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CallHandlingOperations (7) - version16 (16)} + version17 (17)} DEFINITIONS @@ -52,7 +52,7 @@ joint-iso-itu-t remote-operations(4) FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} SendRoutingInfoArg, SendRoutingInfoRes, ProvideRoamingNumberArg, @@ -73,7 +73,7 @@ FROM MAP-Errors { ReleaseResourcesRes FROM MAP-CH-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CH-DataTypes (13) version16 (16)} + gsm-Network (1) modules (3) map-CH-DataTypes (13) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn index d7206842d1..98f285c041 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-CommonDataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.8 Common data types MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} DEFINITIONS @@ -75,6 +75,7 @@ AccessNetworkSignalInfo, LCSServiceTypeID, -- WS added exports needed by gsm_map.asn (extra asn1 file to handle older protocol versions) ProtocolId, + -- gprs location registration types GSN-Address @@ -85,23 +86,23 @@ IMPORTS Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version16 (16)} + gsm-Network (1) modules (3) map-TS-Code (19) version17 (17)} BearerServiceCode, Ext-BearerServiceCode FROM MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version16 (16)} + gsm-Network (1) modules (3) map-BS-Code (20) version17 (17)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version16 (16)} + gsm-Network (1) modules (3) map-SS-Code (15) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; @@ -663,4 +664,3 @@ AgeOfLocationInformation ::= INTEGER (0..32767) -- 32767 minutes old END - diff --git a/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn b/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn index 070cb82580..75eb6a93e2 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-DialogueInformation.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.4 MAP Dialogue Information MAP-DialogueInformation { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-DialogueInformation (3) version16 (16)} + gsm-Network (1) modules (3) map-DialogueInformation (3) version17 (17)} DEFINITIONS @@ -29,12 +29,12 @@ FROM MobileDomainDefinitions { AddressString FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network(1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network(1) modules (3) map-CommonDataTypes (18) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn index f087372c97..44336e0b12 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ER-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.7 Error data types MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version16 (16)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version17 (17)} DEFINITIONS @@ -71,27 +71,28 @@ IMPORTS SS-Status FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version16 (16)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version17 (17)} SignalInfo, BasicServiceCode, NetworkResource, AdditionalNetworkResource, - IMSI + IMSI, + Time FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version16 (16)} + gsm-Network (1) modules (3) map-SS-Code (15) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; RoamingNotAllowedParam ::= SEQUENCE { @@ -179,9 +180,11 @@ AbsentSubscriberSM-Param ::= SEQUENCE { -- if received, additionalAbsentSubscriberDiagnosticSM -- is for GPRS and absentSubscriberDiagnosticSM is -- for non-GPRS - imsi [1] IMSI OPTIONAL} + imsi [1] IMSI OPTIONAL, -- when sent from HLR to IP-SM-GW, IMSI shall be present if UNRI is not set -- to indicate that the absent condition is met for CS and PS but not for IMS. + requestedRetransmissionTime [2] Time OPTIONAL, + userIdentifierAlert [3] IMSI OPTIONAL } AbsentSubscriberDiagnosticSM ::= INTEGER (0..255) -- AbsentSubscriberDiagnosticSM values are defined in 3GPP TS 23.040 diff --git a/epan/dissectors/asn1/gsm_map/MAP-Errors.asn b/epan/dissectors/asn1/gsm_map/MAP-Errors.asn index 6a2df2dade..cbccd3d14d 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Errors.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Errors.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.6.6 Errors MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} DEFINITIONS @@ -106,7 +106,7 @@ FROM Remote-Operations-Information-Objects {joint-iso-itu-t remote-operations(4) SS-Status FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version16 (16)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version17 (17)} SS-IncompatibilityCause, PW-RegistrationFailureCause, @@ -157,7 +157,7 @@ TargetCellOutsideGCA-Param, OngoingGroupCallParam FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version16 (16)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version17 (17)} ; -- generic errors diff --git a/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn index 5f1860468a..1884fe19a9 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ExtensionDataTypes.asn @@ -1,13 +1,13 @@ -- MAP-ExtensionDataTypes.asn -- --- Taken from 3GPP TS 29.002 V13.2.0 (2015-12) +-- Taken from 3GPP TS 29.002 V14.3.0 (2017-03) -- -- 17.7.11 Extension data types -- MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} DEFINITIONS diff --git a/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn index a53eecc803..6f9418808a 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-GR-DataTypes.asn @@ -1,10 +1,10 @@ --- Taken from 3GPP TS 29.002 V13.2.0 (2015-12) +-- Taken from 3GPP TS 29.002 V14.3.0 (2017-03) -- --17.7.12 Group Call data types MAP-GR-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-GR-DataTypes (23) version16 (16)} + gsm-Network (1) modules (3) map-GR-DataTypes (23) version17 (17)} DEFINITIONS @@ -36,12 +36,12 @@ IMPORTS AccessNetworkSignalInfo FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version16 (16)} + gsm-Network (1) modules (3) map-TS-Code (19) version17 (17)} Kc, AdditionalInfo, @@ -51,12 +51,12 @@ Long-GroupId, Cksn FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version16 (16)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn b/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn index 916cb47f6f..0db509e505 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Group-Call-Operations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.6.7 Group Call operations MAP-Group-Call-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Group-Call-Operations (22) - version16 (16)} + version17 (17)} DEFINITIONS @@ -35,7 +35,7 @@ joint-iso-itu-t remote-operations(4) dataMissing FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} PrepareGroupCallArg, PrepareGroupCallRes, @@ -47,7 +47,7 @@ FROM MAP-Errors { SendGroupCallInfoRes FROM MAP-GR-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-GR-DataTypes (23) version16 (16)} + gsm-Network (1) modules (3) map-GR-DataTypes (23) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn index b21c2cf952..f922a6dd50 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-LCS-DataTypes.asn @@ -1,13 +1,13 @@ -- MAP-LCS-DataTypes.asn -- --- Taken from 3GPP TS 29.002 V13.2.0 (2015-12) +-- Taken from 3GPP TS 29.002 V14.3.0 (2017-03) -- -- 17.7.13 Location service data types -- MAP-LCS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-LCS-DataTypes (25) version16 (16)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version17 (17)} DEFINITIONS IMPLICIT TAGS @@ -59,30 +59,30 @@ PLMN-Id, DiameterIdentity FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} ExtensionContainer, SLR-ArgExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} USSD-DataCodingScheme, USSD-String FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-SS-DataTypes (14) version16 (16)} + map-SS-DataTypes (14) version17 (17)} APN, SupportedLCS-CapabilitySets FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version16 (16)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version17 (17)} Additional-Number FROM MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version16 (16)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn index 6971b8e703..2f8c0a6bbe 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-LocationServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.6.8 Location service operations MAP-LocationServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-LocationServiceOperations (24) - version16 (16)} + version17 (17)} DEFINITIONS @@ -40,7 +40,7 @@ systemFailure, illegalSubscriber FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} RoutingInfoForLCS-Arg, RoutingInfoForLCS-Res, @@ -50,7 +50,7 @@ FROM MAP-Errors { SubscriberLocationReport-Res FROM MAP-LCS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-LCS-DataTypes (25) version16 (16)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version17 (17)} ; sendRoutingInfoForLCS OPERATION ::= { --Timer m diff --git a/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn index 6635f7ddc9..4ea3e98a57 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-MS-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.1 Mobile Service data types MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version16 (16)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version17 (17)} DEFINITIONS @@ -14,6 +14,7 @@ IMPLICIT TAGS BEGIN EXPORTS + -- WS modification: for Ericsson proprietary extensions RequestedEquipmentInfo, -- End WS modification @@ -175,22 +176,22 @@ IMPORTS CliRestrictionOption FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version16 (16)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version17 (17)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version16 (16)} + gsm-Network (1) modules (3) map-SS-Code (15) version17 (17)} Ext-BearerServiceCode FROM MAP-BS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-BS-Code (20) version16 (16)} + gsm-Network (1) modules (3) map-BS-Code (20) version17 (17)} Ext-TeleserviceCode FROM MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version16 (16)} + gsm-Network (1) modules (3) map-TS-Code (19) version17 (17)} AddressString, ISDN-AddressString, @@ -229,22 +230,22 @@ RAIdentity, NetworkNodeDiameterAddress FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} AbsentSubscriberDiagnosticSM FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version16 (16)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version17 (17)} TracePropagationList FROM MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version16 (16)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version17 (17)} ; @@ -284,15 +285,17 @@ VLR-Capability ::= SEQUENCE{ supportedRAT-TypesIndicator [7] SupportedRAT-Types OPTIONAL, longGroupID-Supported [8] NULL OPTIONAL, mtRoamingForwardingSupported [9] NULL OPTIONAL, - msisdn-lessOperation-Supported [10] NULL OPTIONAL } + msisdn-lessOperation-Supported [10] NULL OPTIONAL, + reset-ids-Supported [11] NULL OPTIONAL } SupportedRAT-Types::= BIT STRING { utran (0), geran (1), gan (2), i-hspa-evolution (3), - e-utran (4)} (SIZE (2..8)) - -- exception handling: bits 5 to 7 shall be ignored if received and not understood + e-utran (4), + nb-iot (5)} (SIZE (2..8)) + -- exception handling: bits 6 to 7 shall be ignored if received and not understood @@ -580,7 +583,9 @@ Used-RAT-Type::= ENUMERATED { gan (2), i-hspa-evolution (3), e-utran (4), - ...} + ..., + nb-iot (5)} + -- The value e-utran indicates wide-band e-utran EPS-Info ::= CHOICE{ pdn-gw-update [0] PDN-GW-Update, @@ -623,7 +628,8 @@ SGSN-Capability ::= SEQUENCE{ -- in the complete SGSN or MME area cancellationTypeInitialAttach [12] NULL OPTIONAL, msisdn-lessOperation-Supported [14] NULL OPTIONAL, - updateofHomogeneousSupportOfIMSVoiceOverPSSessions [15] NULL OPTIONAL + updateofHomogeneousSupportOfIMSVoiceOverPSSessions [15] NULL OPTIONAL, + reset-ids-Supported [16] NULL OPTIONAL } -- the supportedFeatures , t-adsDataRetrieval and -- homogeneousSupportOfIMSVoiceOverPSSessions @@ -666,8 +672,10 @@ SupportedFeatures::= BIT STRING { gddInSGSN (33), sgsnCAMELCapability (34), pcscf-Restoration (35), - dedicatedCoreNetworks (36)} (SIZE (26..40)) - -- the definition and usage of the above features see the 3GPP TS 29.272 [144]. + dedicatedCoreNetworks (36), + non-IP-PDN-Type-APNs (37), + non-IP-PDP-Type-APNs (38)} (SIZE (26..40)) + -- for the definition and usage of the above features see the 3GPP TS 29.272 [144]. UE-SRVCC-Capability::= ENUMERATED { @@ -1177,14 +1185,25 @@ InsertSubscriberDataArg ::= SEQUENCE { pcscf-Restoration-Request [45] NULL OPTIONAL, adjacentAccessRestrictionDataList [46] AdjacentAccessRestrictionDataList OPTIONAL, imsi-Group-Id-List [47] IMSI-GroupIdList OPTIONAL, - ueUsageType [48] UE-UsageType OPTIONAL } + ueUsageType [48] UE-UsageType OPTIONAL, + userPlaneIntegrityProtectionIndicator [49] NULL OPTIONAL, + dl-Buffering-Suggested-Packet-Count [50] DL-Buffering-Suggested-Packet-Count OPTIONAL, + reset-Id-List [51] Reset-Id-List OPTIONAL } -- If the Network Access Mode parameter is sent, it shall be present only in -- the first sequence if seqmentation is used -Group-Service-ID ::= BIT STRING { - groupSpecificNASlevelCongestionControl (0)} (SIZE (1..32)) - -- exception handling: - -- bits 1 to 31 shall be ignored if received and not understood +Reset-Id-List ::= SEQUENCE SIZE (1..50) OF + Reset-Id + +Reset-Id ::= OCTET STRING (SIZE (1..4)) + -- Reset-Ids shall be unique within the HPLMN. + + +DL-Buffering-Suggested-Packet-Count ::= INTEGER (-1..2147483647) + -- values are defined in 3GPP TS 29.272 [144] + +Group-Service-ID ::= INTEGER (0..4294967295) + -- values are defined in 3GPP TS 29.272 [144] Local-GroupID ::= OCTET STRING (SIZE (1..10)) @@ -1263,8 +1282,11 @@ APN-ConfigurationProfile ::= SEQUENCE { -- If segmentation is used, completeDataListIncluded may only be present in the -- first segment of APN-ConfigurationProfile. epsDataList [1] EPS-DataList, - extensionContainer [2] ExtensionContainer OPTIONAL, - ... } + extensionContainer [2] ExtensionContainer OPTIONAL, + ... , + additionalDefaultContext [3] ContextId OPTIONAL + -- for details see the 3GPP TS 29.272 [144]. + } EPS-DataList ::= SEQUENCE SIZE (1..maxNumOfAPN-Configurations) OF APN-Configuration @@ -1293,7 +1315,26 @@ APN-Configuration ::= SEQUENCE { lipa-Permission [15] LIPA-Permission OPTIONAL, restoration-Priority [16] Restoration-Priority OPTIONAL, sipto-local-network-Permission [17] SIPTO-Local-Network-Permission OPTIONAL, - wlan-offloadability [18] WLAN-Offloadability OPTIONAL + wlan-offloadability [18] WLAN-Offloadability OPTIONAL, + non-IP-PDN-Type-Indicator [19] NULL OPTIONAL, + nIDD-Mechanism [20] NIDD-Mechanism OPTIONAL, + sCEF-ID [21] FQDN OPTIONAL, + pdn-ConnectionContinuity [22] PDN-ConnectionContinuity OPTIONAL + -- absence of pdn-ConnectionContinuity indicates that the handling is left to + -- local VPLMN policy + } + +PDN-ConnectionContinuity ::= ENUMERATED { + maintainPDN-Connection (0), + disconnectPDN-ConnectionWithReactivationRequest (1), + disconnectPDN-ConnectionWithoutReactivationRequest (2) + } + +NIDD-Mechanism ::= ENUMERATED { + sGi-based-data-delivery (0), + sCEF-based-data-delivery (1) + -- The default value, when this information element is not present, is + -- sGi-based-data-delivery (0) } PDN-Type ::= OCTET STRING (SIZE (1)) @@ -1378,14 +1419,15 @@ AccessRestrictionData ::= BIT STRING { geranNotAllowed (1), ganNotAllowed (2), i-hspa-evolutionNotAllowed (3), - e-utranNotAllowed (4), - ho-toNon3GPP-AccessNotAllowed (5) } (SIZE (2..8)) + wb-e-utranNotAllowed (4), + ho-toNon3GPP-AccessNotAllowed (5), + nb-iotNotAllowed (6), + enhancedCoverageNotAllowed (7) } (SIZE (2..8)) -- exception handling: -- The VLR shall ignore the access restriction data related to an access type not -- supported by the node. -- The handling of the access restriction data by the SGSN is described in subclause -- 5.3.19 of TS 23.060, in subclause 7.5.3 of TS 29.060 and subclause 7.3.6 of TS 29.274. - -- bits 6 to 7 shall be ignored if received and not understood AdjacentAccessRestrictionDataList ::= SEQUENCE SIZE (1..50) OF @@ -1469,7 +1511,9 @@ PDP-Context ::= SEQUENCE { sipto-Permission [8] SIPTO-Permission OPTIONAL, lipa-Permission [9] LIPA-Permission OPTIONAL, restoration-Priority [11] Restoration-Priority OPTIONAL, - sipto-local-network-Permission [12] SIPTO-Local-Network-Permission OPTIONAL + sipto-local-network-Permission [12] SIPTO-Local-Network-Permission OPTIONAL, + nIDD-Mechanism [13] NIDD-Mechanism OPTIONAL, + sCEF-ID [14] FQDN OPTIONAL } Restoration-Priority ::= OCTET STRING (SIZE (1)) @@ -1569,7 +1613,7 @@ APN ::= OCTET STRING (SIZE (2..63)) PDP-Type ::= OCTET STRING (SIZE (2)) -- Octets are coded according to TS 3GPP TS 29.060 [105] - -- Only the values PPP, IPv4 and IPv6 are allowed for this parameter. + -- Only the values PPP, IPv4, IPv6 and Non-IP are allowed for this parameter. Ext-PDP-Type ::= OCTET STRING (SIZE (2)) -- Octets are coded, similarly to PDP-Type, according to TS 3GPP TS 29.060 [105]. @@ -2035,7 +2079,11 @@ DeleteSubscriberDataArg ::= SEQUENCE { vplmn-Csg-SubscriptionDeleted [24] NULL OPTIONAL, additionalMSISDN-Withdraw [25] NULL OPTIONAL, cs-to-ps-SRVCC-Withdraw [26] NULL OPTIONAL, - imsiGroupIdList-Withdraw [27] NULL OPTIONAL } + imsiGroupIdList-Withdraw [27] NULL OPTIONAL, + userPlaneIntegrityProtectionWithdraw [28] NULL OPTIONAL, + dl-Buffering-Suggested-Packet-Count-Withdraw [29] NULL OPTIONAL, + ue-UsageTypeWithdraw [30] NULL OPTIONAL, + reset-idsWithdraw [31] NULL OPTIONAL } SpecificCSI-Withdraw ::= BIT STRING { o-csi (0), @@ -2563,7 +2611,10 @@ ResetArg ::= SEQUENCE { hlr-List HLR-List OPTIONAL, -- The hlr-List parameter shall only be applicable for a restart of the HSS/HLR. extensionContainer [0] ExtensionContainer OPTIONAL, - ...} + ..., + reset-Id-List [1] Reset-Id-List OPTIONAL, + subscriptionData [2] InsertSubscriberDataArg OPTIONAL, + subscriptionDataDeletion [3] DeleteSubscriberDataArg OPTIONAL} SendingNode-Number ::= CHOICE { hlr-Number ISDN-AddressString, diff --git a/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn index b3275cd788..ee38a87333 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-MobileServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.6.1 Mobile Service Operations MAP-MobileServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-MobileServiceOperations (5) - version16 (16)} + version17 (17)} DEFINITIONS @@ -113,7 +113,7 @@ joint-iso-itu-t remote-operations(4) FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} UpdateLocationArg, UpdateLocationRes, @@ -172,7 +172,7 @@ PrepareSubsequentHO-Res, FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-MS-DataTypes (11) version16 (16)} + gsm-Network (1) modules (3) map-MS-DataTypes (11) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn index 722b7bf105..8e975d65d1 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-OM-DataTypes.asn @@ -1,9 +1,9 @@ -- 17.7.2 Operation and maintenance data types --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version16 (16)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version17 (17)} DEFINITIONS @@ -33,12 +33,12 @@ IMPORTS PLMN-Id FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn index df97c9102a..8b43260827 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-OperationAndMaintenanceOperations.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) --17.6.2 Operation and Maintenance Operations MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-OperationAndMaintenanceOperations (6) - version16 (16)} + version17 (17)} DEFINITIONS @@ -32,7 +32,7 @@ joint-iso-itu-t remote-operations(4) tracingBufferFull FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} ActivateTraceModeArg, ActivateTraceModeRes, @@ -40,13 +40,13 @@ FROM MAP-Errors { DeactivateTraceModeRes FROM MAP-OM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-OM-DataTypes (12) version16 (16)} + gsm-Network (1) modules (3) map-OM-DataTypes (12) version17 (17)} ISDN-AddressString, IMSI FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn b/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn index 2d8aa11651..283d4eb891 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-Protocol.asn @@ -1,8 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) --17.5 MAP operation and error codes + MAP-Protocol { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Protocol (4) version16 (16)} + gsm-Network (1) modules (3) map-Protocol (4) version17 (17)} DEFINITIONS @@ -49,7 +50,7 @@ authenticationFailureReport, FROM MAP-MobileServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-MobileServiceOperations (5) - version16 (16)} + version17 (17)} activateTraceMode, deactivateTraceMode, @@ -57,7 +58,7 @@ FROM MAP-MobileServiceOperations { FROM MAP-OperationAndMaintenanceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-OperationAndMaintenanceOperations (6) - version16 (16)} + version17 (17)} sendRoutingInfo, provideRoamingNumber, @@ -71,7 +72,7 @@ FROM MAP-OperationAndMaintenanceOperations { FROM MAP-CallHandlingOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-CallHandlingOperations (7) - version16 (16)} + version17 (17)} registerSS, eraseSS, @@ -89,7 +90,7 @@ FROM MAP-CallHandlingOperations { FROM MAP-SupplementaryServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-SupplementaryServiceOperations (8) - version16 (16)} + version17 (17)} sendRoutingInfoForSM, mo-ForwardSM, @@ -102,7 +103,7 @@ FROM MAP-SupplementaryServiceOperations { FROM MAP-ShortMessageServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-ShortMessageServiceOperations (9) - version16 (16)} + version17 (17)} prepareGroupCall, processGroupCallSignalling, @@ -112,7 +113,7 @@ FROM MAP-ShortMessageServiceOperations { FROM MAP-Group-Call-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-Group-Call-Operations (22) - version16 (16)} + version17 (17)} provideSubscriberLocation, sendRoutingInfoForLCS, @@ -120,7 +121,7 @@ FROM MAP-Group-Call-Operations { FROM MAP-LocationServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-LocationServiceOperations (24) - version16 (16)} + version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn index 22bff756a1..2877cf5166 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SM-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.6 Short message data types MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version16 (16)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version17 (17)} DEFINITIONS @@ -46,17 +46,17 @@ IMPORTS FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} AbsentSubscriberDiagnosticSM FROM MAP-ER-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ER-DataTypes (17) version16 (16)} + gsm-Network (1) modules (3) map-ER-DataTypes (17) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} ; @@ -161,7 +161,9 @@ MT-ForwardSM-Arg ::= SEQUENCE { smDeliveryStartTime Time OPTIONAL, smsOverIP-OnlyIndicator [0] NULL OPTIONAL, correlationID [1] CorrelationID OPTIONAL, - maximumRetransmissionTime [2] Time OPTIONAL } + maximumRetransmissionTime [2] Time OPTIONAL, + smsGmscAddress [3] ISDN-AddressString OPTIONAL, + smsGmscDiameterAddress [4] NetworkNodeDiameterAddress OPTIONAL } -- SM-DeliveryTimerValue contains the value used by the SMS-GMSC CorrelationID ::= SEQUENCE { @@ -175,8 +177,7 @@ SIP-URI ::= OCTET STRING MT-ForwardSM-Res ::= SEQUENCE { sm-RP-UI SignalInfo OPTIONAL, extensionContainer ExtensionContainer OPTIONAL, - ..., - requestedRetransmissionTime [0] Time OPTIONAL } + ... } SM-RP-DA ::= CHOICE { imsi [0] IMSI, @@ -244,7 +245,18 @@ AlertServiceCentreArg ::= SEQUENCE { ..., imsi IMSI OPTIONAL, correlationID CorrelationID OPTIONAL, - maximumUeAvailabilityTime [0] Time OPTIONAL } + maximumUeAvailabilityTime [0] Time OPTIONAL, + smsGmscAlertEvent [1] SmsGmsc-Alert-Event OPTIONAL, + smsGmscDiameterAddress [2] NetworkNodeDiameterAddress OPTIONAL, + newSGSNNumber [3] ISDN-AddressString OPTIONAL, + newSGSNDiameterAddress [4] NetworkNodeDiameterAddress OPTIONAL, + newMMENumber [5] ISDN-AddressString OPTIONAL, + newMMEDiameterAddress [6] NetworkNodeDiameterAddress OPTIONAL, + newMSCNumber [7] ISDN-AddressString OPTIONAL } + +SmsGmsc-Alert-Event ::= ENUMERATED { + msAvailableForMtSms (0), + msUnderNewServingNode (1) } InformServiceCentreArg ::= SEQUENCE { storedMSISDN ISDN-AddressString OPTIONAL, diff --git a/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn index d2f56c34b3..a6925e29b5 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SS-Code.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.5 Supplementary service codes MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version16 (16)} + gsm-Network (1) modules (3) map-SS-Code (15) version17 (17)} DEFINITIONS diff --git a/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn index 280db566f7..96f14df4a2 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SS-DataTypes.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.4 Supplementary service data types MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version16 (16)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version17 (17)} DEFINITIONS @@ -57,17 +57,17 @@ IMPORTS ExternalSignalInfo FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-CommonDataTypes (18) version16 (16)} + gsm-Network (1) modules (3) map-CommonDataTypes (18) version17 (17)} ExtensionContainer FROM MAP-ExtensionDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version16 (16)} + gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version17 (17)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version16 (16)} + gsm-Network (1) modules (3) map-SS-Code (15) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn index 65fd8f28d7..4f9503121a 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-ShortMessageServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.6.5 Short message service operations MAP-ShortMessageServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-ShortMessageServiceOperations (9) - version16 (16)} + version17 (17)} DEFINITIONS @@ -45,7 +45,7 @@ joint-iso-itu-t remote-operations(4) absentSubscriberSM FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} RoutingInfoForSM-Arg, RoutingInfoForSM-Res, @@ -63,7 +63,7 @@ FROM MAP-Errors { MT-ForwardSM-VGCS-Res FROM MAP-SM-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SM-DataTypes (16) version16 (16)} + gsm-Network (1) modules (3) map-SM-DataTypes (16) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn b/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn index a31b0a0c14..358f8a599f 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-SupplementaryServiceOperations.asn @@ -1,10 +1,10 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) --17.6.4 Supplementary service operations MAP-SupplementaryServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) map-SupplementaryServiceOperations (8) - version16 (16)} + version17 (17)} DEFINITIONS @@ -59,7 +59,7 @@ joint-iso-itu-t remote-operations(4) facilityNotSupported FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-Errors (10) version16 (16)} + gsm-Network (1) modules (3) map-Errors (10) version17 (17)} RegisterSS-Arg, SS-Info, @@ -77,12 +77,12 @@ FROM MAP-Errors { EraseCC-EntryRes FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version16 (16)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version17 (17)} SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-Code (15) version16 (16)} + gsm-Network (1) modules (3) map-SS-Code (15) version17 (17)} ; diff --git a/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn b/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn index 5d079d552a..4ce2645cf0 100644 --- a/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn +++ b/epan/dissectors/asn1/gsm_map/MAP-TS-Code.asn @@ -1,9 +1,9 @@ --- 3GPP TS 29.002 V13.2.0 (2015-12) +-- 3GPP TS 29.002 V14.3.0 (2017-03) -- 17.7.9 Teleservice Codes MAP-TS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-TS-Code (19) version16 (16)} + gsm-Network (1) modules (3) map-TS-Code (19) version17 (17)} DEFINITIONS diff --git a/epan/dissectors/asn1/gsm_map/SS-DataTypes.asn b/epan/dissectors/asn1/gsm_map/SS-DataTypes.asn index 4a02d004e2..0439b27cd3 100644 --- a/epan/dissectors/asn1/gsm_map/SS-DataTypes.asn +++ b/epan/dissectors/asn1/gsm_map/SS-DataTypes.asn @@ -1,8 +1,8 @@ --- 3GPP TS 24.080 V9.1.0 (2010-03) +-- 3GPP TS 24.080 V14.0.0 (2017-03) -- 4.4.2 ASN.1 data types SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) - ss-DataTypes (2) version10 (10)} + ss-DataTypes (2) version12 (12)} DEFINITIONS @@ -17,21 +17,20 @@ IMPORTS SS-Code FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-SS-Code (15) version10 (10)} + map-SS-Code (15) version12 (12)} -- imports MAP-SS-DataTypes SS-Status, USSD-DataCodingScheme, USSD-String, CCBS-Feature -- USSD-DataCodingScheme, USSD-String were introduced because of CNAP. FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-SS-DataTypes (14) version10 (10)} + map-SS-DataTypes (14) version12 (12)} ---- GSN-Address, WS fix, fault in spec this is now in CommonDataTypes CUG-Index, NotificationToMSUser FROM MAP-MS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-MS-DataTypes (11) version10 (10)} + map-MS-DataTypes (11) version12 (12)} maxSignalInfoLength, ISDN-AddressString, @@ -40,11 +39,11 @@ AlertingPattern, LCSClientExternalID, AddressString, LCSServiceTypeID, -GSN-Address, -- WS fix -AgeOfLocationInformation +AgeOfLocationInformation, +GSN-Address FROM MAP-CommonDataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-CommonDataTypes (18) version10 (10)} + map-CommonDataTypes (18) version12 (12)} LocationType, DeferredLocationEventType, @@ -66,7 +65,7 @@ SequenceNumber FROM MAP-LCS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-LCS-DataTypes (25) version10 (10)} + gsm-Network (1) modules (3) map-LCS-DataTypes (25) version12 (12)} ; diff --git a/epan/dissectors/asn1/gsm_map/SS-Errors.asn b/epan/dissectors/asn1/gsm_map/SS-Errors.asn index ccf8422d4e..a116d6537b 100644 --- a/epan/dissectors/asn1/gsm_map/SS-Errors.asn +++ b/epan/dissectors/asn1/gsm_map/SS-Errors.asn @@ -1,10 +1,10 @@ --- 3GPP TS 24.080 V9.1.0 (2010-03) +-- 3GPP TS 24.080 V14.0.0 (2017-03) -- 4.3.1 Errors ASN.1 specification -- The following ASN.1 module provides an ASN.1 specification of errors. Errors from MAP are imported in the SS Protocol module in subclause 4.5. The module defines errors by allocating them a local value. For the involved errors the same local values as in MAP are allocated. SS-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) - ss-Errors (1) version10 (10)} + ss-Errors (1) version12 (12)} DEFINITIONS ::= @@ -42,4 +42,3 @@ rejectedByUser ERROR ::= { CODE local:121 } END - diff --git a/epan/dissectors/asn1/gsm_map/SS-Operations.asn b/epan/dissectors/asn1/gsm_map/SS-Operations.asn index ac720a112e..e65b40c829 100644 --- a/epan/dissectors/asn1/gsm_map/SS-Operations.asn +++ b/epan/dissectors/asn1/gsm_map/SS-Operations.asn @@ -1,8 +1,8 @@ --- 3GPP TS 24.080 V9.1.0 (2010-03) +-- 3GPP TS 24.080 V14.0.0 (2017-03) -- 4.2 Operation types SS-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) - ss-Operations (0) version10 (10)} + ss-Operations (0) version12 (12)} DEFINITIONS ::= @@ -53,26 +53,26 @@ LCS-PeriodicLocationCancellationArg FROM SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) - ss-DataTypes (2) version10 (10)} + ss-DataTypes (2) version12 (12)} -- imports MAP-SS-data types RegisterCC-EntryRes FROM MAP-SS-DataTypes { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Network (1) modules (3) map-SS-DataTypes (14) version10 (10)} + gsm-Network (1) modules (3) map-SS-DataTypes (14) version12 (12)} -- imports MAP-errors illegalSS-Operation, ss-ErrorStatus, ss-NotAvailable, ss-SubscriptionViolation, ss-Incompatibility, systemFailure, facilityNotSupported, callBarred, unexpectedDataValue, shortTermDenial, longTermDenial, dataMissing, forwardingViolation, forwardingFailed, positionMethodFailure FROM MAP-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-Errors (10) version10 (10)} + map-Errors (10) version12 (12)} -- imports SS-Errors resourcesNotAvailable, maxNumberOfMPTY-ParticipantsExceeded, deflectionToServedSubscriber, invalidDeflectedToNumber, specialServiceCode, rejectedByUser, rejectedByNetwork FROM SS-Errors { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) - ss-Errors (1) version10 (10)} + ss-Errors (1) version12 (12)} ; -- operations definition diff --git a/epan/dissectors/asn1/gsm_map/SS-Protocol.asn b/epan/dissectors/asn1/gsm_map/SS-Protocol.asn index 60e3d7c91e..58a9f82d1a 100644 --- a/epan/dissectors/asn1/gsm_map/SS-Protocol.asn +++ b/epan/dissectors/asn1/gsm_map/SS-Protocol.asn @@ -1,10 +1,10 @@ --- 3GPP TS 24.080 V9.1.0 (2010-03) +-- 3GPP TS 24.080 V14.0.0 (2017-03) -- 4.5 Operations and errors implementation -- For the actual implementation of supplementary services, operations and errors have to be defined by value. The following ASN.1 module, imports operation from the ASN.1 module described in subclause 4.2 and operations and errors from MAP. SS-Protocol { itu-t identified-organization (4) etsi (0) mobileDomain (0) - gsm-Access (2) modules (3) ss-Protocol (3) version10 (10)} + gsm-Access (2) modules (3) ss-Protocol (3) version12 (12)} DEFINITIONS ::= @@ -22,14 +22,14 @@ joint-iso-itu-t remote-operations(4) informationObjects(5) version1(0)} forwardCheckSS-Indication FROM MAP-MobileServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-MobileServiceOperations (5) version10 (10)} + map-MobileServiceOperations (5) version12 (12)} -- imports operations from MAP-SupplementaryServiceOperations registerSS, eraseSS, activateSS, deactivateSS, interrogateSS, registerPassword, getPassword, processUnstructuredSS-Request, unstructuredSS-Request, unstructuredSS-Notify, eraseCC-Entry FROM MAP-SupplementaryServiceOperations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Network (1) modules (3) - map-SupplementaryServiceOperations (8) version10 (10)} + map-SupplementaryServiceOperations (8) version12 (12)} -- imports operations from SS-Operations processUnstructuredSS-Data, notifySS, forwardChargeAdvice, buildMPTY, holdMPTY, retrieveMPTY, @@ -37,7 +37,7 @@ splitMPTY, explicitCT, forwardCUG-Info, accessRegisterCCEntry, callDeflection, u lcs-LocationNotification, lcs-MOLR, lcs-AreaEventRequest, lcs-AreaEventReport, lcs-AreaEventCancellation, lcs-PeriodicLocationRequest, lcs-LocationUpdate, lcs-PeriodicLocationCancellation FROM SS-Operations { itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) - ss-Operations (0) version10 (10)} + ss-Operations (0) version12 (12)} ; diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 5637772167..c27b893dc9 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -278,6 +278,8 @@ static int hf_gsm_map_er_diagnosticInfo = -1; /* SignalInfo */ static int hf_gsm_map_er_absentSubscriberDiagnosticSM = -1; /* AbsentSubscriberDiagnosticSM */ static int hf_gsm_map_er_additionalAbsentSubscriberDiagnosticSM = -1; /* AbsentSubscriberDiagnosticSM */ static int hf_gsm_map_er_imsi = -1; /* IMSI */ +static int hf_gsm_map_er_requestedRetransmissionTime = -1; /* Time */ +static int hf_gsm_map_er_userIdentifierAlert = -1; /* IMSI */ static int hf_gsm_map_er_networkResource = -1; /* NetworkResource */ static int hf_gsm_map_er_extensibleSystemFailureParam = -1; /* ExtensibleSystemFailureParam */ static int hf_gsm_map_er_additionalNetworkResource = -1; /* AdditionalNetworkResource */ @@ -332,10 +334,11 @@ static int hf_gsm_map_sm_smDeliveryTimer = -1; /* SM_DeliveryTimerValue */ static int hf_gsm_map_sm_smDeliveryStartTime = -1; /* Time */ static int hf_gsm_map_sm_smsOverIP_OnlyIndicator = -1; /* NULL */ static int hf_gsm_map_sm_maximumRetransmissionTime = -1; /* Time */ +static int hf_gsm_map_sm_smsGmscAddress = -1; /* ISDN_AddressString */ +static int hf_gsm_map_sm_smsGmscDiameterAddress = -1; /* NetworkNodeDiameterAddress */ static int hf_gsm_map_sm_hlr_id = -1; /* HLR_Id */ static int hf_gsm_map_sm_sip_uri_A = -1; /* SIP_URI */ static int hf_gsm_map_sm_sip_uri_B = -1; /* SIP_URI */ -static int hf_gsm_map_sm_requestedRetransmissionTime = -1; /* Time */ static int hf_gsm_map_sm_imsi_01 = -1; /* T_imsi */ static int hf_gsm_map_sm_lmsi_01 = -1; /* T_lmsi */ static int hf_gsm_map_sm_serviceCentreAddressDA = -1; /* T_serviceCentreAddressDA */ @@ -352,6 +355,12 @@ static int hf_gsm_map_sm_ip_sm_gw_sm_deliveryOutcome = -1; /* SM_DeliveryOutcom static int hf_gsm_map_sm_ip_sm_gw_absentSubscriberDiagnosticSM = -1; /* AbsentSubscriberDiagnosticSM */ static int hf_gsm_map_sm_storedMSISDN = -1; /* ISDN_AddressString */ static int hf_gsm_map_sm_maximumUeAvailabilityTime = -1; /* Time */ +static int hf_gsm_map_sm_smsGmscAlertEvent = -1; /* SmsGmsc_Alert_Event */ +static int hf_gsm_map_sm_newSGSNNumber = -1; /* ISDN_AddressString */ +static int hf_gsm_map_sm_newSGSNDiameterAddress = -1; /* NetworkNodeDiameterAddress */ +static int hf_gsm_map_sm_newMMENumber = -1; /* ISDN_AddressString */ +static int hf_gsm_map_sm_newMMEDiameterAddress = -1; /* NetworkNodeDiameterAddress */ +static int hf_gsm_map_sm_newMSCNumber = -1; /* ISDN_AddressString */ static int hf_gsm_map_sm_mw_Status = -1; /* MW_Status */ static int hf_gsm_map_sm_alertReason = -1; /* AlertReason */ static int hf_gsm_map_sm_alertReasonIndicator = -1; /* NULL */ @@ -577,6 +586,7 @@ static int hf_gsm_map_ms_supportedRAT_TypesIndicator = -1; /* SupportedRAT_Type static int hf_gsm_map_ms_longGroupID_Supported = -1; /* NULL */ static int hf_gsm_map_ms_mtRoamingForwardingSupported = -1; /* NULL */ static int hf_gsm_map_ms_msisdn_lessOperation_Supported = -1; /* NULL */ +static int hf_gsm_map_ms_reset_ids_Supported = -1; /* NULL */ static int hf_gsm_map_ms_sendSubscriberData = -1; /* NULL */ static int hf_gsm_map_ms_subscriberDataStored = -1; /* AgeIndicator */ static int hf_gsm_map_ms_hlr_Number = -1; /* ISDN_AddressString */ @@ -755,6 +765,7 @@ static int hf_gsm_map_ms_equipmentStatus = -1; /* EquipmentStatus */ static int hf_gsm_map_ms_bmuef = -1; /* UESBI_Iu */ static int hf_gsm_map_ms_uesbi_IuA = -1; /* UESBI_IuA */ static int hf_gsm_map_ms_uesbi_IuB = -1; /* UESBI_IuB */ +static int hf_gsm_map_ms_Reset_Id_List_item = -1; /* Reset_Id */ static int hf_gsm_map_ms_IMSI_GroupIdList_item = -1; /* IMSI_GroupId */ static int hf_gsm_map_ms_group_Service_Id = -1; /* Group_Service_ID */ static int hf_gsm_map_ms_plmnId = -1; /* PLMN_Id */ @@ -777,6 +788,7 @@ static int hf_gsm_map_ms_subscribed_vsrvcc = -1; /* NULL */ static int hf_gsm_map_ms_defaultContext = -1; /* ContextId */ static int hf_gsm_map_ms_completeDataListIncluded = -1; /* NULL */ static int hf_gsm_map_ms_epsDataList = -1; /* EPS_DataList */ +static int hf_gsm_map_ms_additionalDefaultContext = -1; /* ContextId */ static int hf_gsm_map_ms_EPS_DataList_item = -1; /* APN_Configuration */ static int hf_gsm_map_ms_pdn_Type = -1; /* PDN_Type */ static int hf_gsm_map_ms_servedPartyIP_IPv4_Address = -1; /* PDP_Address */ @@ -791,6 +803,10 @@ static int hf_gsm_map_ms_lipa_Permission = -1; /* LIPA_Permission */ static int hf_gsm_map_ms_restoration_Priority = -1; /* Restoration_Priority */ static int hf_gsm_map_ms_sipto_local_network_Permission = -1; /* SIPTO_Local_Network_Permission */ static int hf_gsm_map_ms_wlan_offloadability = -1; /* WLAN_Offloadability */ +static int hf_gsm_map_ms_non_IP_PDN_Type_Indicator = -1; /* NULL */ +static int hf_gsm_map_ms_nIDD_Mechanism = -1; /* NIDD_Mechanism */ +static int hf_gsm_map_ms_sCEF_ID = -1; /* FQDN */ +static int hf_gsm_map_ms_pdn_ConnectionContinuity = -1; /* PDN_ConnectionContinuity */ 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 */ @@ -929,6 +945,10 @@ static int hf_gsm_map_ms_vplmn_Csg_SubscriptionDeleted = -1; /* NULL */ static int hf_gsm_map_ms_additionalMSISDN_Withdraw = -1; /* NULL */ static int hf_gsm_map_ms_cs_to_ps_SRVCC_Withdraw = -1; /* NULL */ static int hf_gsm_map_ms_imsiGroupIdList_Withdraw = -1; /* NULL */ +static int hf_gsm_map_ms_userPlaneIntegrityProtectionWithdraw = -1; /* NULL */ +static int hf_gsm_map_ms_dl_Buffering_Suggested_Packet_Count_Withdraw = -1; /* NULL */ +static int hf_gsm_map_ms_ue_UsageTypeWithdraw = -1; /* NULL */ +static int hf_gsm_map_ms_reset_idsWithdraw = -1; /* NULL */ static int hf_gsm_map_ms_allGPRSData = -1; /* NULL */ static int hf_gsm_map_ms_contextIdList = -1; /* ContextIdList */ static int hf_gsm_map_ms_allEPS_Data = -1; /* NULL */ @@ -989,6 +1009,9 @@ static int hf_gsm_map_ms_ggsn_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_ms_mobileNotReachableReason = -1; /* AbsentSubscriberDiagnosticSM */ static int hf_gsm_map_ms_sendingNodenumber = -1; /* SendingNode_Number */ static int hf_gsm_map_ms_hlr_List = -1; /* HLR_List */ +static int hf_gsm_map_ms_reset_Id_List = -1; /* Reset_Id_List */ +static int hf_gsm_map_ms_subscriptionData = -1; /* InsertSubscriberDataArg */ +static int hf_gsm_map_ms_subscriptionDataDeletion = -1; /* DeleteSubscriberDataArg */ static int hf_gsm_map_ms_css_Number = -1; /* ISDN_AddressString */ static int hf_gsm_map_ms_msNotReachable = -1; /* NULL */ static int hf_gsm_map_ms_VBSDataList_item = -1; /* VoiceBroadcastData */ @@ -1180,12 +1203,15 @@ static int hf_gsm_map_ms_cs_to_ps_SRVCC_Allowed_Indicator = -1; /* NULL */ static int hf_gsm_map_ms_pcscf_Restoration_Request = -1; /* NULL */ static int hf_gsm_map_ms_adjacentAccessRestrictionDataList = -1; /* AdjacentAccessRestrictionDataList */ static int hf_gsm_map_ms_imsi_Group_Id_List = -1; /* IMSI_GroupIdList */ +static int hf_gsm_map_ms_userPlaneIntegrityProtectionIndicator = -1; /* NULL */ +static int hf_gsm_map_ms_dl_Buffering_Suggested_Packet_Count = -1; /* DL_Buffering_Suggested_Packet_Count */ /* named bits */ static int hf_gsm_map_ms_SupportedRAT_Types_utran = -1; static int hf_gsm_map_ms_SupportedRAT_Types_geran = -1; static int hf_gsm_map_ms_SupportedRAT_Types_gan = -1; static int hf_gsm_map_ms_SupportedRAT_Types_i_hspa_evolution = -1; static int hf_gsm_map_ms_SupportedRAT_Types_e_utran = -1; +static int hf_gsm_map_ms_SupportedRAT_Types_nb_iot = -1; static int hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1 = -1; static int hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet2 = -1; static int hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet3 = -1; @@ -1231,6 +1257,8 @@ static int hf_gsm_map_ms_SupportedFeatures_gddInSGSN = -1; static int hf_gsm_map_ms_SupportedFeatures_sgsnCAMELCapability = -1; static int hf_gsm_map_ms_SupportedFeatures_pcscf_Restoration = -1; static int hf_gsm_map_ms_SupportedFeatures_dedicatedCoreNetworks = -1; +static int hf_gsm_map_ms_SupportedFeatures_non_IP_PDN_Type_APNs = -1; +static int hf_gsm_map_ms_SupportedFeatures_non_IP_PDP_Type_APNs = -1; static int hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_not_allowed_bit = -1; static int hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_spare_bit = -1; static int hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_sending_indicator = -1; @@ -1239,13 +1267,14 @@ static int hf_gsm_map_ms_LCLS_ConfigurationPreference_forward_data_reception_ind static int hf_gsm_map_ms_LCLS_ConfigurationPreference_backward_data_reception_indicator = -1; static int hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus = -1; static int hf_gsm_map_ms_RequestedEquipmentInfo_bmuef = -1; -static int hf_gsm_map_ms_Group_Service_ID_groupSpecificNASlevelCongestionControl = -1; static int hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed = -1; static int hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed = -1; static int hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed = -1; static int hf_gsm_map_ms_AccessRestrictionData_i_hspa_evolutionNotAllowed = -1; -static int hf_gsm_map_ms_AccessRestrictionData_e_utranNotAllowed = -1; +static int hf_gsm_map_ms_AccessRestrictionData_wb_e_utranNotAllowed = -1; static int hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed = -1; +static int hf_gsm_map_ms_AccessRestrictionData_nb_iotNotAllowed = -1; +static int hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed = -1; static int hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred = -1; static int hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred = -1; @@ -2220,7 +2249,7 @@ static gint ett_gsm_map_ms_CheckIMEI_Res = -1; static gint ett_gsm_map_ms_RequestedEquipmentInfo = -1; static gint ett_gsm_map_ms_UESBI_Iu = -1; static gint ett_gsm_map_ms_InsertSubscriberDataArg = -1; -static gint ett_gsm_map_ms_Group_Service_ID = -1; +static gint ett_gsm_map_ms_Reset_Id_List = -1; static gint ett_gsm_map_ms_IMSI_GroupIdList = -1; static gint ett_gsm_map_ms_IMSI_GroupId = -1; static gint ett_gsm_map_ms_CSG_SubscriptionDataList = -1; @@ -5484,6 +5513,8 @@ static const ber_sequence_t gsm_map_er_AbsentSubscriberSM_Param_sequence[] = { { &hf_gsm_map_er_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, { &hf_gsm_map_er_additionalAbsentSubscriberDiagnosticSM, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_er_AbsentSubscriberDiagnosticSM }, { &hf_gsm_map_er_imsi , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, + { &hf_gsm_map_er_requestedRetransmissionTime, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Time }, + { &hf_gsm_map_er_userIdentifierAlert, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, { NULL, 0, 0, 0, NULL } }; @@ -6586,6 +6617,8 @@ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Arg_sequence[] = { { &hf_gsm_map_sm_smsOverIP_OnlyIndicator, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_NULL }, { &hf_gsm_map_sm_correlationID, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_CorrelationID }, { &hf_gsm_map_sm_maximumRetransmissionTime, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Time }, + { &hf_gsm_map_sm_smsGmscAddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_sm_smsGmscDiameterAddress, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, { NULL, 0, 0, 0, NULL } }; @@ -6614,7 +6647,6 @@ dissect_gsm_map_sm_MT_ForwardSM_Arg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static const ber_sequence_t gsm_map_sm_MT_ForwardSM_Res_sequence[] = { { &hf_gsm_map_sm_sm_RP_UI , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_SignalInfo }, { &hf_gsm_map_sm_extensionContainer, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_ExtensionContainer }, - { &hf_gsm_map_sm_requestedRetransmissionTime, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Time }, { NULL, 0, 0, 0, NULL } }; @@ -6683,12 +6715,35 @@ dissect_gsm_map_sm_ReportSM_DeliveryStatusRes(gboolean implicit_tag _U_, tvbuff_ } +static const value_string gsm_map_sm_SmsGmsc_Alert_Event_vals[] = { + { 0, "msAvailableForMtSms" }, + { 1, "msUnderNewServingNode" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_sm_SmsGmsc_Alert_Event(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_sm_AlertServiceCentreArg_sequence[] = { { &hf_gsm_map_sm_msisdn , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ISDN_AddressString }, { &hf_gsm_map_sm_serviceCentreAddress, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_AddressString }, { &hf_gsm_map_sm_imsi , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_sm_correlationID, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_sm_CorrelationID }, { &hf_gsm_map_sm_maximumUeAvailabilityTime, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_Time }, + { &hf_gsm_map_sm_smsGmscAlertEvent, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_sm_SmsGmsc_Alert_Event }, + { &hf_gsm_map_sm_smsGmscDiameterAddress, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, + { &hf_gsm_map_sm_newSGSNNumber, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_sm_newSGSNDiameterAddress, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, + { &hf_gsm_map_sm_newMMENumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, + { &hf_gsm_map_sm_newMMEDiameterAddress, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_NetworkNodeDiameterAddress }, + { &hf_gsm_map_sm_newMSCNumber, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, { NULL, 0, 0, 0, NULL } }; @@ -7997,6 +8052,7 @@ static const asn_namedbit gsm_map_ms_SupportedRAT_Types_bits[] = { { 2, &hf_gsm_map_ms_SupportedRAT_Types_gan, -1, -1, "gan", NULL }, { 3, &hf_gsm_map_ms_SupportedRAT_Types_i_hspa_evolution, -1, -1, "i-hspa-evolution", NULL }, { 4, &hf_gsm_map_ms_SupportedRAT_Types_e_utran, -1, -1, "e-utran", NULL }, + { 5, &hf_gsm_map_ms_SupportedRAT_Types_nb_iot, -1, -1, "nb-iot", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -8023,6 +8079,7 @@ static const ber_sequence_t gsm_map_ms_VLR_Capability_sequence[] = { { &hf_gsm_map_ms_longGroupID_Supported, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_mtRoamingForwardingSupported, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_msisdn_lessOperation_Supported, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_reset_ids_Supported, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -8889,6 +8946,8 @@ static const asn_namedbit gsm_map_ms_SupportedFeatures_bits[] = { { 34, &hf_gsm_map_ms_SupportedFeatures_sgsnCAMELCapability, -1, -1, "sgsnCAMELCapability", NULL }, { 35, &hf_gsm_map_ms_SupportedFeatures_pcscf_Restoration, -1, -1, "pcscf-Restoration", NULL }, { 36, &hf_gsm_map_ms_SupportedFeatures_dedicatedCoreNetworks, -1, -1, "dedicatedCoreNetworks", NULL }, + { 37, &hf_gsm_map_ms_SupportedFeatures_non_IP_PDN_Type_APNs, -1, -1, "non-IP-PDN-Type-APNs", NULL }, + { 38, &hf_gsm_map_ms_SupportedFeatures_non_IP_PDP_Type_APNs, -1, -1, "non-IP-PDP-Type-APNs", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -8918,6 +8977,7 @@ static const ber_sequence_t gsm_map_ms_SGSN_Capability_sequence[] = { { &hf_gsm_map_ms_cancellationTypeInitialAttach, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_msisdn_lessOperation_Supported, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_updateofHomogeneousSupportOfIMSVoiceOverPSSessions, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_reset_ids_Supported, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -9077,6 +9137,7 @@ static const value_string gsm_map_ms_Used_RAT_Type_vals[] = { { 2, "gan" }, { 3, "i-hspa-evolution" }, { 4, "e-utran" }, + { 5, "nb-iot" }, { 0, NULL } }; @@ -11707,6 +11768,22 @@ dissect_gsm_map_ms_SIPTO_Local_Network_Permission(gboolean implicit_tag _U_, tvb } +static const value_string gsm_map_ms_NIDD_Mechanism_vals[] = { + { 0, "sGi-based-data-delivery" }, + { 1, "sCEF-based-data-delivery" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_ms_NIDD_Mechanism(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_PDP_Context_sequence[] = { { &hf_gsm_map_ms_pdp_ContextId, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_ContextId }, { &hf_gsm_map_ms_pdp_Type , BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDP_Type }, @@ -11728,6 +11805,8 @@ static const ber_sequence_t gsm_map_ms_PDP_Context_sequence[] = { { &hf_gsm_map_ms_lipa_Permission, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_LIPA_Permission }, { &hf_gsm_map_ms_restoration_Priority, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Restoration_Priority }, { &hf_gsm_map_ms_sipto_local_network_Permission, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SIPTO_Local_Network_Permission }, + { &hf_gsm_map_ms_nIDD_Mechanism, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NIDD_Mechanism }, + { &hf_gsm_map_ms_sCEF_ID , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_FQDN }, { NULL, 0, 0, 0, NULL } }; @@ -12220,8 +12299,10 @@ static const asn_namedbit gsm_map_ms_AccessRestrictionData_bits[] = { { 1, &hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed, -1, -1, "geranNotAllowed", NULL }, { 2, &hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed, -1, -1, "ganNotAllowed", NULL }, { 3, &hf_gsm_map_ms_AccessRestrictionData_i_hspa_evolutionNotAllowed, -1, -1, "i-hspa-evolutionNotAllowed", NULL }, - { 4, &hf_gsm_map_ms_AccessRestrictionData_e_utranNotAllowed, -1, -1, "e-utranNotAllowed", NULL }, + { 4, &hf_gsm_map_ms_AccessRestrictionData_wb_e_utranNotAllowed, -1, -1, "wb-e-utranNotAllowed", NULL }, { 5, &hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed, -1, -1, "ho-toNon3GPP-AccessNotAllowed", NULL }, + { 6, &hf_gsm_map_ms_AccessRestrictionData_nb_iotNotAllowed, -1, -1, "nb-iotNotAllowed", NULL }, + { 7, &hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed, -1, -1, "enhancedCoverageNotAllowed", NULL }, { 0, NULL, 0, 0, NULL, NULL } }; @@ -12385,6 +12466,23 @@ dissect_gsm_map_ms_WLAN_Offloadability(gboolean implicit_tag _U_, tvbuff_t *tvb } +static const value_string gsm_map_ms_PDN_ConnectionContinuity_vals[] = { + { 0, "maintainPDN-Connection" }, + { 1, "disconnectPDN-ConnectionWithReactivationRequest" }, + { 2, "disconnectPDN-ConnectionWithoutReactivationRequest" }, + { 0, NULL } +}; + + +static int +dissect_gsm_map_ms_PDN_ConnectionContinuity(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_APN_Configuration_sequence[] = { { &hf_gsm_map_ms_contextId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ContextId }, { &hf_gsm_map_ms_pdn_Type , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_Type }, @@ -12405,6 +12503,10 @@ static const ber_sequence_t gsm_map_ms_APN_Configuration_sequence[] = { { &hf_gsm_map_ms_restoration_Priority, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Restoration_Priority }, { &hf_gsm_map_ms_sipto_local_network_Permission, BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_SIPTO_Local_Network_Permission }, { &hf_gsm_map_ms_wlan_offloadability, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_WLAN_Offloadability }, + { &hf_gsm_map_ms_non_IP_PDN_Type_Indicator, BER_CLASS_CON, 19, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_nIDD_Mechanism, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NIDD_Mechanism }, + { &hf_gsm_map_ms_sCEF_ID , BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_FQDN }, + { &hf_gsm_map_ms_pdn_ConnectionContinuity, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_PDN_ConnectionContinuity }, { NULL, 0, 0, 0, NULL } }; @@ -12435,6 +12537,7 @@ static const ber_sequence_t gsm_map_ms_APN_ConfigurationProfile_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_epsDataList, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_EPS_DataList }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_additionalDefaultContext, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_ContextId }, { NULL, 0, 0, 0, NULL } }; @@ -12530,16 +12633,11 @@ dissect_gsm_map_ms_AdjacentAccessRestrictionDataList(gboolean implicit_tag _U_, } -static const asn_namedbit gsm_map_ms_Group_Service_ID_bits[] = { - { 0, &hf_gsm_map_ms_Group_Service_ID_groupSpecificNASlevelCongestionControl, -1, -1, "groupSpecificNASlevelCongestionControl", NULL }, - { 0, NULL, 0, 0, NULL, NULL } -}; static int dissect_gsm_map_ms_Group_Service_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_bitstring(implicit_tag, actx, tree, tvb, offset, - gsm_map_ms_Group_Service_ID_bits, hf_index, ett_gsm_map_ms_Group_Service_ID, - NULL); + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -12584,6 +12682,39 @@ dissect_gsm_map_ms_IMSI_GroupIdList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ } + +static int +dissect_gsm_map_ms_DL_Buffering_Suggested_Packet_Count(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + + +static int +dissect_gsm_map_ms_Reset_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); + + return offset; +} + + +static const ber_sequence_t gsm_map_ms_Reset_Id_List_sequence_of[1] = { + { &hf_gsm_map_ms_Reset_Id_List_item, BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_gsm_map_ms_Reset_Id }, +}; + +static int +dissect_gsm_map_ms_Reset_Id_List(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, + gsm_map_ms_Reset_Id_List_sequence_of, hf_index, ett_gsm_map_ms_Reset_Id_List); + + return offset; +} + + static const ber_sequence_t gsm_map_ms_InsertSubscriberDataArg_sequence[] = { { &hf_gsm_map_ms_imsi , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_IMSI }, { &hf_gsm_map_ms_msisdn , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ISDN_AddressString }, @@ -12632,6 +12763,9 @@ static const ber_sequence_t gsm_map_ms_InsertSubscriberDataArg_sequence[] = { { &hf_gsm_map_ms_adjacentAccessRestrictionDataList, BER_CLASS_CON, 46, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_AdjacentAccessRestrictionDataList }, { &hf_gsm_map_ms_imsi_Group_Id_List, BER_CLASS_CON, 47, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_IMSI_GroupIdList }, { &hf_gsm_map_ms_ueUsageType, BER_CLASS_CON, 48, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_UE_UsageType }, + { &hf_gsm_map_ms_userPlaneIntegrityProtectionIndicator, BER_CLASS_CON, 49, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_dl_Buffering_Suggested_Packet_Count, BER_CLASS_CON, 50, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_DL_Buffering_Suggested_Packet_Count }, + { &hf_gsm_map_ms_reset_Id_List, BER_CLASS_CON, 51, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Reset_Id_List }, { NULL, 0, 0, 0, NULL } }; @@ -12870,6 +13004,10 @@ static const ber_sequence_t gsm_map_ms_DeleteSubscriberDataArg_sequence[] = { { &hf_gsm_map_ms_additionalMSISDN_Withdraw, BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_cs_to_ps_SRVCC_Withdraw, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { &hf_gsm_map_ms_imsiGroupIdList_Withdraw, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_userPlaneIntegrityProtectionWithdraw, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_dl_Buffering_Suggested_Packet_Count_Withdraw, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_ue_UsageTypeWithdraw, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, + { &hf_gsm_map_ms_reset_idsWithdraw, BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_NULL }, { NULL, 0, 0, 0, NULL } }; @@ -13054,6 +13192,9 @@ static const ber_sequence_t gsm_map_ms_ResetArg_sequence[] = { { &hf_gsm_map_ms_sendingNodenumber, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_gsm_map_ms_SendingNode_Number }, { &hf_gsm_map_ms_hlr_List , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_gsm_map_HLR_List }, { &hf_gsm_map_ms_extensionContainer, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ExtensionContainer }, + { &hf_gsm_map_ms_reset_Id_List, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_Reset_Id_List }, + { &hf_gsm_map_ms_subscriptionData, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_InsertSubscriberDataArg }, + { &hf_gsm_map_ms_subscriptionDataDeletion, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gsm_map_ms_DeleteSubscriberDataArg }, { NULL, 0, 0, 0, NULL } }; @@ -23828,6 +23969,14 @@ void proto_register_gsm_map(void) { { "imsi", "gsm_map.er.imsi", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_er_requestedRetransmissionTime, + { "requestedRetransmissionTime", "gsm_map.er.requestedRetransmissionTime", + FT_BYTES, BASE_NONE, NULL, 0, + "Time", HFILL }}, + { &hf_gsm_map_er_userIdentifierAlert, + { "userIdentifierAlert", "gsm_map.er.userIdentifierAlert", + FT_BYTES, BASE_NONE, NULL, 0, + "IMSI", HFILL }}, { &hf_gsm_map_er_networkResource, { "networkResource", "gsm_map.er.networkResource", FT_UINT32, BASE_DEC, VALS(gsm_map_NetworkResource_vals), 0, @@ -24035,6 +24184,14 @@ void proto_register_gsm_map(void) { { "maximumRetransmissionTime", "gsm_map.sm.maximumRetransmissionTime", FT_BYTES, BASE_NONE, NULL, 0, "Time", HFILL }}, + { &hf_gsm_map_sm_smsGmscAddress, + { "smsGmscAddress", "gsm_map.sm.smsGmscAddress", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_sm_smsGmscDiameterAddress, + { "smsGmscDiameterAddress", "gsm_map.sm.smsGmscDiameterAddress_element", + FT_NONE, BASE_NONE, NULL, 0, + "NetworkNodeDiameterAddress", HFILL }}, { &hf_gsm_map_sm_hlr_id, { "hlr-id", "gsm_map.sm.hlr_id", FT_BYTES, BASE_NONE, NULL, 0, @@ -24047,10 +24204,6 @@ void proto_register_gsm_map(void) { { "sip-uri-B", "gsm_map.sm.sip_uri_B", FT_BYTES, BASE_NONE, NULL, 0, "SIP_URI", HFILL }}, - { &hf_gsm_map_sm_requestedRetransmissionTime, - { "requestedRetransmissionTime", "gsm_map.sm.requestedRetransmissionTime", - FT_BYTES, BASE_NONE, NULL, 0, - "Time", HFILL }}, { &hf_gsm_map_sm_imsi_01, { "imsi", "gsm_map.sm.imsi", FT_BYTES, BASE_NONE, NULL, 0, @@ -24115,6 +24268,30 @@ void proto_register_gsm_map(void) { { "maximumUeAvailabilityTime", "gsm_map.sm.maximumUeAvailabilityTime", FT_BYTES, BASE_NONE, NULL, 0, "Time", HFILL }}, + { &hf_gsm_map_sm_smsGmscAlertEvent, + { "smsGmscAlertEvent", "gsm_map.sm.smsGmscAlertEvent", + FT_UINT32, BASE_DEC, VALS(gsm_map_sm_SmsGmsc_Alert_Event_vals), 0, + "SmsGmsc_Alert_Event", HFILL }}, + { &hf_gsm_map_sm_newSGSNNumber, + { "newSGSNNumber", "gsm_map.sm.newSGSNNumber", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_sm_newSGSNDiameterAddress, + { "newSGSNDiameterAddress", "gsm_map.sm.newSGSNDiameterAddress_element", + FT_NONE, BASE_NONE, NULL, 0, + "NetworkNodeDiameterAddress", HFILL }}, + { &hf_gsm_map_sm_newMMENumber, + { "newMMENumber", "gsm_map.sm.newMMENumber", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, + { &hf_gsm_map_sm_newMMEDiameterAddress, + { "newMMEDiameterAddress", "gsm_map.sm.newMMEDiameterAddress_element", + FT_NONE, BASE_NONE, NULL, 0, + "NetworkNodeDiameterAddress", HFILL }}, + { &hf_gsm_map_sm_newMSCNumber, + { "newMSCNumber", "gsm_map.sm.newMSCNumber", + FT_BYTES, BASE_NONE, NULL, 0, + "ISDN_AddressString", HFILL }}, { &hf_gsm_map_sm_mw_Status, { "mw-Status", "gsm_map.sm.mw_Status", FT_BYTES, BASE_NONE, NULL, 0, @@ -24989,6 +25166,10 @@ void proto_register_gsm_map(void) { { "msisdn-lessOperation-Supported", "gsm_map.ms.msisdn_lessOperation_Supported_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_reset_ids_Supported, + { "reset-ids-Supported", "gsm_map.ms.reset_ids_Supported_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_sendSubscriberData, { "sendSubscriberData", "gsm_map.ms.sendSubscriberData_element", FT_NONE, BASE_NONE, NULL, 0, @@ -25701,13 +25882,17 @@ void proto_register_gsm_map(void) { { "uesbi-IuB", "gsm_map.ms.uesbi_IuB", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_Reset_Id_List_item, + { "Reset-Id", "gsm_map.ms.Reset_Id", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_IMSI_GroupIdList_item, { "IMSI-GroupId", "gsm_map.ms.IMSI_GroupId_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_gsm_map_ms_group_Service_Id, { "group-Service-Id", "gsm_map.ms.group_Service_Id", - FT_BYTES, BASE_NONE, NULL, 0, + FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_gsm_map_ms_plmnId, { "plmnId", "gsm_map.ms.plmnId", @@ -25789,6 +25974,10 @@ void proto_register_gsm_map(void) { { "epsDataList", "gsm_map.ms.epsDataList", FT_UINT32, BASE_DEC, NULL, 0, "EPS_DataList", HFILL }}, + { &hf_gsm_map_ms_additionalDefaultContext, + { "additionalDefaultContext", "gsm_map.ms.additionalDefaultContext", + FT_UINT32, BASE_DEC, NULL, 0, + "ContextId", HFILL }}, { &hf_gsm_map_ms_EPS_DataList_item, { "APN-Configuration", "gsm_map.ms.APN_Configuration_element", FT_NONE, BASE_NONE, NULL, 0, @@ -25845,6 +26034,22 @@ void proto_register_gsm_map(void) { { "wlan-offloadability", "gsm_map.ms.wlan_offloadability_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_non_IP_PDN_Type_Indicator, + { "non-IP-PDN-Type-Indicator", "gsm_map.ms.non_IP_PDN_Type_Indicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_nIDD_Mechanism, + { "nIDD-Mechanism", "gsm_map.ms.nIDD_Mechanism", + FT_UINT32, BASE_DEC, VALS(gsm_map_ms_NIDD_Mechanism_vals), 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_sCEF_ID, + { "sCEF-ID", "gsm_map.ms.sCEF_ID", + FT_BYTES, BASE_NONE, NULL, 0, + "FQDN", HFILL }}, + { &hf_gsm_map_ms_pdn_ConnectionContinuity, + { "pdn-ConnectionContinuity", "gsm_map.ms.pdn_ConnectionContinuity", + FT_UINT32, BASE_DEC, VALS(gsm_map_ms_PDN_ConnectionContinuity_vals), 0, + NULL, HFILL }}, { &hf_gsm_map_ms_qos_Class_Identifier, { "qos-Class-Identifier", "gsm_map.ms.qos_Class_Identifier", FT_UINT32, BASE_DEC, NULL, 0, @@ -26397,6 +26602,22 @@ void proto_register_gsm_map(void) { { "imsiGroupIdList-Withdraw", "gsm_map.ms.imsiGroupIdList_Withdraw_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_userPlaneIntegrityProtectionWithdraw, + { "userPlaneIntegrityProtectionWithdraw", "gsm_map.ms.userPlaneIntegrityProtectionWithdraw_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_dl_Buffering_Suggested_Packet_Count_Withdraw, + { "dl-Buffering-Suggested-Packet-Count-Withdraw", "gsm_map.ms.dl_Buffering_Suggested_Packet_Count_Withdraw_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_ue_UsageTypeWithdraw, + { "ue-UsageTypeWithdraw", "gsm_map.ms.ue_UsageTypeWithdraw_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_reset_idsWithdraw, + { "reset-idsWithdraw", "gsm_map.ms.reset_idsWithdraw_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_allGPRSData, { "allGPRSData", "gsm_map.ms.allGPRSData_element", FT_NONE, BASE_NONE, NULL, 0, @@ -26637,6 +26858,18 @@ void proto_register_gsm_map(void) { { "hlr-List", "gsm_map.ms.hlr_List", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, + { &hf_gsm_map_ms_reset_Id_List, + { "reset-Id-List", "gsm_map.ms.reset_Id_List", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_subscriptionData, + { "subscriptionData", "gsm_map.ms.subscriptionData_element", + FT_NONE, BASE_NONE, NULL, 0, + "InsertSubscriberDataArg", HFILL }}, + { &hf_gsm_map_ms_subscriptionDataDeletion, + { "subscriptionDataDeletion", "gsm_map.ms.subscriptionDataDeletion_element", + FT_NONE, BASE_NONE, NULL, 0, + "DeleteSubscriberDataArg", HFILL }}, { &hf_gsm_map_ms_css_Number, { "css-Number", "gsm_map.ms.css_Number", FT_BYTES, BASE_NONE, NULL, 0, @@ -27401,6 +27634,14 @@ void proto_register_gsm_map(void) { { "imsi-Group-Id-List", "gsm_map.ms.imsi_Group_Id_List", FT_UINT32, BASE_DEC, NULL, 0, "IMSI_GroupIdList", HFILL }}, + { &hf_gsm_map_ms_userPlaneIntegrityProtectionIndicator, + { "userPlaneIntegrityProtectionIndicator", "gsm_map.ms.userPlaneIntegrityProtectionIndicator_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_gsm_map_ms_dl_Buffering_Suggested_Packet_Count, + { "dl-Buffering-Suggested-Packet-Count", "gsm_map.ms.dl_Buffering_Suggested_Packet_Count", + FT_INT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, { &hf_gsm_map_ms_SupportedRAT_Types_utran, { "utran", "gsm_map.ms.utran", FT_BOOLEAN, 8, NULL, 0x80, @@ -27421,6 +27662,10 @@ void proto_register_gsm_map(void) { { "e-utran", "gsm_map.ms.e-utran", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedRAT_Types_nb_iot, + { "nb-iot", "gsm_map.ms.nb-iot", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1, { "lcsCapabilitySet1", "gsm_map.ms.lcsCapabilitySet1", FT_BOOLEAN, 8, NULL, 0x80, @@ -27601,6 +27846,14 @@ void proto_register_gsm_map(void) { { "dedicatedCoreNetworks", "gsm_map.ms.dedicatedCoreNetworks", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_non_IP_PDN_Type_APNs, + { "non-IP-PDN-Type-APNs", "gsm_map.ms.non-IP-PDN-Type-APNs", + FT_BOOLEAN, 8, NULL, 0x04, + NULL, HFILL }}, + { &hf_gsm_map_ms_SupportedFeatures_non_IP_PDP_Type_APNs, + { "non-IP-PDP-Type-APNs", "gsm_map.ms.non-IP-PDP-Type-APNs", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, { &hf_gsm_map_ms_LCLS_Negotiation_permission_indicator_not_allowed_bit, { "permission-indicator-not-allowed-bit", "gsm_map.ms.permission-indicator-not-allowed-bit", FT_BOOLEAN, 8, NULL, 0x80, @@ -27633,10 +27886,6 @@ void proto_register_gsm_map(void) { { "bmuef", "gsm_map.ms.bmuef", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - { &hf_gsm_map_ms_Group_Service_ID_groupSpecificNASlevelCongestionControl, - { "groupSpecificNASlevelCongestionControl", "gsm_map.ms.groupSpecificNASlevelCongestionControl", - FT_BOOLEAN, 8, NULL, 0x80, - NULL, HFILL }}, { &hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed, { "utranNotAllowed", "gsm_map.ms.utranNotAllowed", FT_BOOLEAN, 8, NULL, 0x80, @@ -27653,14 +27902,22 @@ void proto_register_gsm_map(void) { { "i-hspa-evolutionNotAllowed", "gsm_map.ms.i-hspa-evolutionNotAllowed", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, - { &hf_gsm_map_ms_AccessRestrictionData_e_utranNotAllowed, - { "e-utranNotAllowed", "gsm_map.ms.e-utranNotAllowed", + { &hf_gsm_map_ms_AccessRestrictionData_wb_e_utranNotAllowed, + { "wb-e-utranNotAllowed", "gsm_map.ms.wb-e-utranNotAllowed", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }}, { &hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed, { "ho-toNon3GPP-AccessNotAllowed", "gsm_map.ms.ho-toNon3GPP-AccessNotAllowed", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }}, + { &hf_gsm_map_ms_AccessRestrictionData_nb_iotNotAllowed, + { "nb-iotNotAllowed", "gsm_map.ms.nb-iotNotAllowed", + FT_BOOLEAN, 8, NULL, 0x02, + NULL, HFILL }}, + { &hf_gsm_map_ms_AccessRestrictionData_enhancedCoverageNotAllowed, + { "enhancedCoverageNotAllowed", "gsm_map.ms.enhancedCoverageNotAllowed", + FT_BOOLEAN, 8, NULL, 0x01, + NULL, HFILL }}, { &hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred, { "allOG-CallsBarred", "gsm_map.ms.allOG-CallsBarred", FT_BOOLEAN, 8, NULL, 0x80, @@ -30638,7 +30895,7 @@ void proto_register_gsm_map(void) { &ett_gsm_map_ms_RequestedEquipmentInfo, &ett_gsm_map_ms_UESBI_Iu, &ett_gsm_map_ms_InsertSubscriberDataArg, - &ett_gsm_map_ms_Group_Service_ID, + &ett_gsm_map_ms_Reset_Id_List, &ett_gsm_map_ms_IMSI_GroupIdList, &ett_gsm_map_ms_IMSI_GroupId, &ett_gsm_map_ms_CSG_SubscriptionDataList, |