Update MAP specification from version9 to version12
Except from whitespace differences, this is what wireshark svn uses.
diff --git a/asn1/MAP-CommonDataTypes.asn b/asn1/MAP-CommonDataTypes.asn
index 55d234e..ecf5189 100644
--- a/asn1/MAP-CommonDataTypes.asn
+++ b/asn1/MAP-CommonDataTypes.asn
@@ -1,6 +1,10 @@
+-- $Id: MAP-CommonDataTypes.asn 34814 2010-11-08 23:15:16Z etxrab $
+-- 3GPP TS 29.002 V9.3.0 (2010-09)
+-- 17.7.8 Common data types
+
MAP-CommonDataTypes {
itu-t identified-organization (4) etsi (0) mobileDomain (0)
- gsm-Network (1) modules (3) map-CommonDataTypes (18) version9 (9)}
+ gsm-Network (1) modules (3) map-CommonDataTypes (18) version12 (12)}
DEFINITIONS
@@ -25,6 +29,7 @@
maxSignalInfoLength,
AlertingPattern,
TBCD-STRING,
+ DiameterIdentity,
-- data types for numbering and identification
IMSI,
@@ -41,6 +46,7 @@
NAEA-CIC,
ASCI-CallReference,
SubscriberIdentity,
+ PLMN-Id,
-- data types for CAMEL
CellGlobalIdOrServiceAreaIdOrLAI,
@@ -61,7 +67,13 @@
AgeOfLocationInformation,
LCSClientExternalID,
LCSClientInternalID,
- LCSServiceTypeID
+ LCSServiceTypeID,
+
+ -- WS added exports needed by gsm_map.asn (extra asn1 file to handle older prot. ver.)
+ ProtocolId,
+ -- gprs location registration types
+ GSN-Address
+
;
IMPORTS
@@ -69,23 +81,23 @@
Ext-TeleserviceCode
FROM MAP-TS-Code {
itu-t identified-organization (4) etsi (0) mobileDomain (0)
- gsm-Network (1) modules (3) map-TS-Code (19) version9 (9)}
+ gsm-Network (1) modules (3) map-TS-Code (19) version12 (12)}
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) version9 (9)}
+ gsm-Network (1) modules (3) map-BS-Code (20) version12 (12)}
SS-Code
FROM MAP-SS-Code {
itu-t identified-organization (4) etsi (0) mobileDomain (0)
- gsm-Network (1) modules (3) map-SS-Code (15) version9 (9)}
+ gsm-Network (1) modules (3) map-SS-Code (15) version12 (12)}
ExtensionContainer
FROM MAP-ExtensionDataTypes {
itu-t identified-organization (4) etsi (0) mobileDomain (0)
- gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)}
+ gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version12 (12)}
;
@@ -101,6 +113,9 @@
-- bits 8765 of octet n encoding digit 2n
-- bits 4321 of octet n encoding digit 2(n-1) +1
+DiameterIdentity ::= OCTET STRING (SIZE(9..55))
+-- content of DiameterIdentity is defined in IETF RFC 3588 [139]
+
AddressString ::= OCTET STRING (SIZE (1..maxAddressLength))
-- This type is used to represent a number for addressing
-- purposes. It is composed of
@@ -153,8 +168,7 @@
FTN-AddressString ::=
AddressString (SIZE (1..maxFTN-AddressLength))
-- This type is used to represent forwarded-to numbers.
- -- For long forwarded-to numbers (longer than 15 digits) NPI shall be unknown;
- -- if NAI = international the first digits represent the country code (CC)
+ -- If NAI = international the first digits represent the country code (CC)
-- and the network destination code (NDC) as for E.164.
maxFTN-AddressLength INTEGER ::= 15
@@ -295,6 +309,9 @@
-- 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))
@@ -311,7 +328,8 @@
...}
ASCI-CallReference ::= TBCD-STRING (SIZE (1..8))
- -- digits of VGCS/VBC-area,Group-ID are concatenated in this order.
+ -- digits of VGCS/VBS-area,Group-ID are concatenated in this order if there is a
+ -- VGCS/VBS-area.
TMSI ::= OCTET STRING (SIZE (1..4))
@@ -367,7 +385,9 @@
gsmSCF (3),
nplr (4),
auc (5),
- ...}
+ ... ,
+ ue (6),
+ mme (7)}
-- if unknown value is received in AdditionalNetworkResource
-- it shall be ignored.
@@ -379,9 +399,9 @@
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 {
@@ -499,6 +519,16 @@
serv126 LCSServiceTypeID ::= 126
serv127 LCSServiceTypeID ::= 127
+PLMN-Id ::= OCTET STRING (SIZE (3))
+ -- The internal structure is defined as follows:
+ -- octet 1 bits 4321 Mobile Country Code 1st digit
+ -- bits 8765 Mobile Country Code 2nd digit
+ -- octet 2 bits 4321 Mobile Country Code 3rd digit
+ -- bits 8765 Mobile Network Code 3rd digit
+ -- or filler (1111) for 2 digit MNCs
+ -- octet 3 bits 4321 Mobile Network Code 1st digit
+ -- bits 8765 Mobile Network Code 2nd digit
+
-- data types for CAMEL
CellGlobalIdOrServiceAreaIdOrLAI ::= CHOICE {
@@ -522,7 +552,7 @@
-- according to 3GPP TS 23.003
LAIFixedLength ::= OCTET STRING (SIZE (5))
- -- Refers to Location Area Identification defined in TS 3GPP TS 23.003 [17].
+ -- Refers to Location Area Identification defined in 3GPP TS 23.003 [17].
-- The internal structure is defined as follows:
-- octet 1 bits 4321 Mobile Country Code 1st digit
-- bits 8765 Mobile Country Code 2nd digit
@@ -531,7 +561,7 @@
-- or filler (1111) for 2 digit MNCs
-- octet 3 bits 4321 Mobile Network Code 1st digit
-- bits 8765 Mobile Network Code 2nd digit
- -- octets 4 and 5 Location Area Code according to TS 3GPP TS 24.008 [35]
+ -- octets 4 and 5 Location Area Code according to 3GPP TS 24.008 [35]
-- data types for subscriber management
@@ -604,9 +634,9 @@
-- 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