summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-03-27 16:03:22 +0200
committerHarald Welte <laforge@gnumonks.org>2011-03-27 16:03:22 +0200
commita1786e9e56d8c81fab6dcaa463d00e5606254187 (patch)
tree17e18dc8d7953a0440d379a85cd5b73ce46b879c
parentd4a3adaaae300d74ce92b675005a64492cdeda7c (diff)
fix a bug in END detection
-rw-r--r--main.c2
-rw-r--r--output/4.2.0/MAP-ApplicationContext.asn13
-rw-r--r--output/4.2.0/MAP-BS-Code.asn13
-rw-r--r--output/4.2.0/MAP-CH-DataTypes.asn13
-rw-r--r--output/4.2.0/MAP-CallHandlingOperations.asn13
-rw-r--r--output/4.2.0/MAP-CommonDataTypes.asn13
-rw-r--r--output/4.2.0/MAP-DialogueInformation.asn13
-rw-r--r--output/4.2.0/MAP-ER-DataTypes.asn13
-rw-r--r--output/4.2.0/MAP-Errors.asn13
-rw-r--r--output/4.2.0/MAP-MS-DataTypes.asn13
-rw-r--r--output/4.2.0/MAP-MobileServiceOperations.asn13
-rw-r--r--output/4.2.0/MAP-OM-DataTypes.asn13
-rw-r--r--output/4.2.0/MAP-OperationAndMaintenanceOperations.asn13
-rw-r--r--output/4.2.0/MAP-Protocol.asn13
-rw-r--r--output/4.2.0/MAP-SM-DataTypes.asn13
-rw-r--r--output/4.2.0/MAP-SS-Code.asn13
-rw-r--r--output/4.2.0/MAP-SS-DataTypes.asn13
-rw-r--r--output/4.2.0/MAP-ShortMessageServiceOperations.asn13
-rw-r--r--output/4.2.0/MAP-SupplementaryServiceOperations.asn13
-rw-r--r--output/4.2.0/MAP-TS-Code.asn13
-rw-r--r--output/4.3.0/MAP-ApplicationContext.asn17
-rw-r--r--output/4.3.0/MAP-BS-Code.asn147
-rw-r--r--output/4.3.0/MAP-CH-DataTypes.asn139
-rw-r--r--output/4.3.0/MAP-CallHandlingOperations.asn135
-rw-r--r--output/4.3.0/MAP-CommonDataTypes.asn188
-rw-r--r--output/4.3.0/MAP-DialogueInformation.asn113
-rw-r--r--output/4.3.0/MAP-ER-DataTypes.asn122
-rw-r--r--output/4.3.0/MAP-Errors.asn125
-rw-r--r--output/4.3.0/MAP-MS-DataTypes.asn183
-rw-r--r--output/4.3.0/MAP-MobileServiceOperations.asn162
-rw-r--r--output/4.3.0/MAP-OM-DataTypes.asn131
-rw-r--r--output/4.3.0/MAP-OperationAndMaintenanceOperations.asn135
-rw-r--r--output/4.3.0/MAP-Protocol.asn139
-rw-r--r--output/4.3.0/MAP-SM-DataTypes.asn135
-rw-r--r--output/4.3.0/MAP-SS-Code.asn195
-rw-r--r--output/4.3.0/MAP-SS-DataTypes.asn137
-rw-r--r--output/4.3.0/MAP-ShortMessageServiceOperations.asn137
-rw-r--r--output/4.3.0/MAP-SupplementaryServiceOperations.asn146
-rw-r--r--output/4.3.0/MAP-TS-Code.asn136
39 files changed, 515 insertions, 356 deletions
diff --git a/main.c b/main.c
index efc4439..8798340 100644
--- a/main.c
+++ b/main.c
@@ -144,7 +144,7 @@ restart:
found = strstr(tmp, ".#");
if (found) {
found_delta = found - tmp;
- if (strlen(found) > 2 && !strncmp(found, ".#END", 5)) {
+ if (!strncmp(wh->base_addr + start_offs + found_delta, ".#END", 5)) {
/* end */
dump_end = start_offs + found_delta;
DBG("Found END (0x%x): '%s'\n", dump_end, found);
diff --git a/output/4.2.0/MAP-ApplicationContext.asn1 b/output/4.2.0/MAP-ApplicationContext.asn1
index fe6ae37..80063f5 100644
--- a/output/4.2.0/MAP-ApplicationContext.asn1
+++ b/output/4.2.0/MAP-ApplicationContext.asn1
@@ -108,3 +108,6 @@ mwdMngtContext-v1 OBJECT IDENTIFIER ::=
shortMsgMT-RelayContext-v2 OBJECT IDENTIFIER ::=
{map-ac shortMsgMT-Relay (25) version2(2)}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-BS-Code.asn1 b/output/4.2.0/MAP-BS-Code.asn1
index c71e9f8..4bf0134 100644
--- a/output/4.2.0/MAP-BS-Code.asn1
+++ b/output/4.2.0/MAP-BS-Code.asn1
@@ -86,3 +86,6 @@ plmn-specificBS-D BearerServiceCode ::= '11011101'B
plmn-specificBS-E BearerServiceCode ::= '11011110'B
plmn-specificBS-F BearerServiceCode ::= '11011111'B
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-CH-DataTypes.asn1 b/output/4.2.0/MAP-CH-DataTypes.asn1
index b9d706d..c6e878d 100644
--- a/output/4.2.0/MAP-CH-DataTypes.asn1
+++ b/output/4.2.0/MAP-CH-DataTypes.asn1
@@ -129,3 +129,6 @@ ProvideRoamingNumberArg ::= SEQUENCE {
--<B-- imei [8] IMEI}--B>--
-- NU1 imei must not be used in version 1
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-CallHandlingOperations.asn1 b/output/4.2.0/MAP-CallHandlingOperations.asn1
index a767bbb..e2bb763 100644
--- a/output/4.2.0/MAP-CallHandlingOperations.asn1
+++ b/output/4.2.0/MAP-CallHandlingOperations.asn1
@@ -161,3 +161,6 @@ ProvideRoamingNumber ::= OPERATION --Timer m--
--<B-- NoSubscriberReply,--B>--
--<B-- RadioCongestion}--B>--
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-CommonDataTypes.asn1 b/output/4.2.0/MAP-CommonDataTypes.asn1
index 8398468..c127e41 100644
--- a/output/4.2.0/MAP-CommonDataTypes.asn1
+++ b/output/4.2.0/MAP-CommonDataTypes.asn1
@@ -248,3 +248,6 @@ BasicServiceGroupList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
maxNumOfBasicServiceGroups INTEGER ::= 13
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-DialogueInformation.asn1 b/output/4.2.0/MAP-DialogueInformation.asn1
index 66b99a0..0dad814 100644
--- a/output/4.2.0/MAP-DialogueInformation.asn1
+++ b/output/4.2.0/MAP-DialogueInformation.asn1
@@ -89,3 +89,6 @@ MAP-ProviderAbortReason ::= ENUMERATED {
abnormalDialogue (0),
invalidPDU (1)}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-ER-DataTypes.asn1 b/output/4.2.0/MAP-ER-DataTypes.asn1
index f1d2dea..9477b60 100644
--- a/output/4.2.0/MAP-ER-DataTypes.asn1
+++ b/output/4.2.0/MAP-ER-DataTypes.asn1
@@ -85,3 +85,6 @@ SM-DeliveryFailureCause ::= ENUMERATED {
invalidSME-Address (5),
subscriberNotSC-Subscriber (6)}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-Errors.asn1 b/output/4.2.0/MAP-Errors.asn1
index f41822b..a6c0a0b 100644
--- a/output/4.2.0/MAP-Errors.asn1
+++ b/output/4.2.0/MAP-Errors.asn1
@@ -247,3 +247,6 @@ SM-DeliveryFailure ::= ERROR
MessageWaitingListFull ::= ERROR
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-MS-DataTypes.asn1 b/output/4.2.0/MAP-MS-DataTypes.asn1
index 14888e3..2fb836d 100644
--- a/output/4.2.0/MAP-MS-DataTypes.asn1
+++ b/output/4.2.0/MAP-MS-DataTypes.asn1
@@ -392,3 +392,6 @@ RestoreDataRes ::= SEQUENCE {
COMPONENTS OF HLR-NumberWithRoamingRestrictions,
msNotReachable NULL OPTIONAL}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-MobileServiceOperations.asn1 b/output/4.2.0/MAP-MobileServiceOperations.asn1
index d1b5bd5..fb99d25 100644
--- a/output/4.2.0/MAP-MobileServiceOperations.asn1
+++ b/output/4.2.0/MAP-MobileServiceOperations.asn1
@@ -437,3 +437,6 @@ RestoreData ::= OPERATION --Timer m--
UnexpectedDataValue,
UnknownSubscriber}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-OM-DataTypes.asn1 b/output/4.2.0/MAP-OM-DataTypes.asn1
index 36f817d..2c9471e 100644
--- a/output/4.2.0/MAP-OM-DataTypes.asn1
+++ b/output/4.2.0/MAP-OM-DataTypes.asn1
@@ -69,3 +69,6 @@ HandoverType ::= ENUMERATED {
interBSS (0),
intraBSS (1)}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-OperationAndMaintenanceOperations.asn1 b/output/4.2.0/MAP-OperationAndMaintenanceOperations.asn1
index 9d92768..de1dc75 100644
--- a/output/4.2.0/MAP-OperationAndMaintenanceOperations.asn1
+++ b/output/4.2.0/MAP-OperationAndMaintenanceOperations.asn1
@@ -90,3 +90,6 @@ SendIMSI ::= OPERATION --Timer m--
UnexpectedDataValue,
UnknownSubscriber}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-Protocol.asn1 b/output/4.2.0/MAP-Protocol.asn1
index 80ea2cb..5cac186 100644
--- a/output/4.2.0/MAP-Protocol.asn1
+++ b/output/4.2.0/MAP-Protocol.asn1
@@ -315,3 +315,6 @@ numberOfPW-AttemptsViolation NumberOfPW-AttemptsViolation ::= localValue 43
sm-DeliveryFailure SM-DeliveryFailure ::= localValue 32
messageWaitingListFull MessageWaitingListFull ::= localValue 33
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-SM-DataTypes.asn1 b/output/4.2.0/MAP-SM-DataTypes.asn1
index 16a2d41..d5b38d4 100644
--- a/output/4.2.0/MAP-SM-DataTypes.asn1
+++ b/output/4.2.0/MAP-SM-DataTypes.asn1
@@ -116,3 +116,6 @@ AlertReason ::= ENUMERATED {
ms-Present (0),
memoryAvailable (1)}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-SS-Code.asn1 b/output/4.2.0/MAP-SS-Code.asn1
index 6add9cb..0f7e8e1 100644
--- a/output/4.2.0/MAP-SS-Code.asn1
+++ b/output/4.2.0/MAP-SS-Code.asn1
@@ -122,3 +122,6 @@ plmn-specificSS-D SS-Code ::= '11111101'B
plmn-specificSS-E SS-Code ::= '11111110'B
plmn-specificSS-F SS-Code ::= '11111111'B
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-SS-DataTypes.asn1 b/output/4.2.0/MAP-SS-DataTypes.asn1
index 2ea6249..635d8c2 100644
--- a/output/4.2.0/MAP-SS-DataTypes.asn1
+++ b/output/4.2.0/MAP-SS-DataTypes.asn1
@@ -316,3 +316,6 @@ ForwardingData ::= SEQUENCE {
-- OA1 forwardedToSubaddress must be absent in version 1
forwardingOptions [6] ForwardingOptions OPTIONAL}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-ShortMessageServiceOperations.asn1 b/output/4.2.0/MAP-ShortMessageServiceOperations.asn1
index 943824a..9a80c91 100644
--- a/output/4.2.0/MAP-ShortMessageServiceOperations.asn1
+++ b/output/4.2.0/MAP-ShortMessageServiceOperations.asn1
@@ -168,3 +168,6 @@ ReadyForSM ::= OPERATION --Timer m--
UnexpectedDataValue,
UnknownSubscriber}
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-SupplementaryServiceOperations.asn1 b/output/4.2.0/MAP-SupplementaryServiceOperations.asn1
index d8d22e9..20580d2 100644
--- a/output/4.2.0/MAP-SupplementaryServiceOperations.asn1
+++ b/output/4.2.0/MAP-SupplementaryServiceOperations.asn1
@@ -287,3 +287,6 @@ BeginSubscriberActivity ::= OPERATION --Timer m--
ARGUMENT
beginSubscriberActivityArg BeginSubscriberActivityArg
+
+END
+-- MODULE END
diff --git a/output/4.2.0/MAP-TS-Code.asn1 b/output/4.2.0/MAP-TS-Code.asn1
index 046f6d0..85941a6 100644
--- a/output/4.2.0/MAP-TS-Code.asn1
+++ b/output/4.2.0/MAP-TS-Code.asn1
@@ -58,3 +58,6 @@ plmn-specificTS-D TeleserviceCode ::= '11011101'B
plmn-specificTS-E TeleserviceCode ::= '11011110'B
plmn-specificTS-F TeleserviceCode ::= '11011111'B
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-ApplicationContext.asn1 b/output/4.3.0/MAP-ApplicationContext.asn1
index fe6ae37..607bfa1 100644
--- a/output/4.3.0/MAP-ApplicationContext.asn1
+++ b/output/4.3.0/MAP-ApplicationContext.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-ApplicationContext' START
MAP-ApplicationContext {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-ApplicationContext (2) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-ApplicationContext (2) version2 (2)}
DEFINITIONS
@@ -108,3 +108,6 @@ mwdMngtContext-v1 OBJECT IDENTIFIER ::=
shortMsgMT-RelayContext-v2 OBJECT IDENTIFIER ::=
{map-ac shortMsgMT-Relay (25) version2(2)}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-BS-Code.asn1 b/output/4.3.0/MAP-BS-Code.asn1
index c71e9f8..23ec9d4 100644
--- a/output/4.3.0/MAP-BS-Code.asn1
+++ b/output/4.3.0/MAP-BS-Code.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-BS-Code' START
MAP-BS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-BS-Code (20) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-BS-Code (20) version2 (2)}
DEFINITIONS
@@ -11,22 +11,23 @@ DEFINITIONS
BEGIN
BearerServiceCode ::= OCTET STRING (SIZE (1))
- -- This type is used to represent the code identifying a single bearer service,
- -- a group of bearer services, or all bearer services. The services are
- -- defined in GSM 02.02.
+ -- This type is used to represent the code identifying a single
+ -- bearer service, a group of bearer services, or all bearer
+ -- services. The services are defined in GSM 02.02.
-- The internal structure is defined as follows:
-- v1: bit 8: Transparency indicator (If applicable)
- -- 0 transparent (postfix T) or if not applicable (no postfix T or NT)
- -- 1 non transparent (postfix NT)
+ -- 0 transparent (postfix T) or if not applicable
+ -- (no postfix T or NT)
+ -- 1 non transparent (postfix NT)
- -- v2:
+ -- v2: bit 8: 0 (unused)
-- plmn-specific bearer services:
-- bits 87654321: defined by the HPLMN operator
-- rest of bearer services:
- -- bit 8: 0 (unused)
- -- bits 7654321: group (bits 7654), and rate, if applicable (bits 321)
+ -- bits 7654321: group (bits 7654), and rate, if applicable
+ -- (bits 321)
-- symbolic constants are assigned only for v2
allBearerServices BearerServiceCode ::= '00000000'B
@@ -43,7 +44,7 @@ allDataCDS-Services BearerServiceCode ::= '00011000'B
dataCDS-1200bps BearerServiceCode ::= '00011010'B
dataCDS-2400bps BearerServiceCode ::= '00011100'B
dataCDS-4800bps BearerServiceCode ::= '00011101'B
-dataCDS-9600bps BearerServiceCode ::= '00011110'B
+dataCDS-9600bps BearerServiceCode ::= '00011110'B
allPadAccessCA-Services BearerServiceCode ::= '00100000'B
padAccessCA-300bps BearerServiceCode ::= '00100001'B
@@ -68,6 +69,27 @@ allSpeechFollowedByDataCDS BearerServiceCode ::= '01001000'B
allUnrestrictedDigital-12-kbps BearerServiceCode ::= '01111000'B
+-- NU1 The following non-hierarchical Compound Bearer Service
+-- Groups are defined in TS GSM 02.30:
+allDataCircuitAsynchronous BearerServiceCode ::= '01010000'B
+ -- covers 'allDataCDA-Services', 'allAlternateSpeech-DataCDA' and
+ -- 'allSpeechFollowedByDataCDA'
+allAsynchronousServices BearerServiceCode ::= '01100000'B
+ -- covers 'allDataCDA-Services', 'allAlternateSpeech-DataCDA',
+ -- 'allSpeechFollowedByDataCDA' and 'allPadAccessCDA-Services'
+allDataCircuitSynchronous BearerServiceCode ::= '01011000'B
+ -- covers 'allDataCDS-Services', 'allAlternateSpeech-DataCDS' and
+ -- 'allSpeechFollowedByDataCDS'
+allSynchronousServices BearerServiceCode ::= '01101000'B
+ -- covers 'allDataCDS-Services', 'allAlternateSpeech-DataCDS',
+ -- 'allSpeechFollowedByDataCDS' and 'allDataPDS-Services'
+-- NU1
+-- NU1 Compound Bearer Service Group Codes are only used in call
+-- NU1 independent supplementary service operations, ie they
+-- NU1 are not used in InsertSubscriberData or in
+-- NU1 DeleteSubscriberData messages. Compound Bearer Service Group
+-- NU1 Codes must not be used in version 1.
+
allPLMN-specificBS BearerServiceCode ::= '11010000'B
-- NU1 *plmn-specific* must not be used in version 1
plmn-specificBS-1 BearerServiceCode ::= '11010001'B
@@ -86,3 +108,6 @@ plmn-specificBS-D BearerServiceCode ::= '11011101'B
plmn-specificBS-E BearerServiceCode ::= '11011110'B
plmn-specificBS-F BearerServiceCode ::= '11011111'B
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-CH-DataTypes.asn1 b/output/4.3.0/MAP-CH-DataTypes.asn1
index b9d706d..bf69160 100644
--- a/output/4.3.0/MAP-CH-DataTypes.asn1
+++ b/output/4.3.0/MAP-CH-DataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-CH-DataTypes' START
MAP-CH-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CH-DataTypes (13) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CH-DataTypes (13) version2 (2)}
DEFINITIONS
@@ -30,8 +30,8 @@ IMPORTS
--<B-- SS-DataList,--B>--
ForwardingData
FROM MAP-SS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-DataTypes (14) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-DataTypes (14) version2 (2)}
ISDN-AddressString,
ExternalSignalInfo,
@@ -41,33 +41,33 @@ FROM MAP-SS-DataTypes {
--<B-- Category,--B>--
--<B-- BasicServiceCode--B>--
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
--<B--InfoForIC-Arg ::= SEQUENCE {--B>--
--<B-- roamingNumber [0] ISDN-AddressString,--B>--
--<B-- basicService BasicServiceCode OPTIONAL,--B>--
---<B-- dialledNumber [5] ISDN-AddressString OPTIONAL,--B>--
+--<B-- dialledNumber [5] ISDN-AddressString OPTIONAL,--B>--
--<B-- cug-CheckInfo [6] CUG-CheckInfo OPTIONAL,--B>--
-- OA1 cug-CHeckInfo must be absent in version 1
--<B-- numberOfForwarding [7] NumberOfForwarding OPTIONAL}--B>--
CUG-CheckInfo ::= SEQUENCE {
cug-Interlock CUG-Interlock,
- cug-OutgoingAccess NULL OPTIONAL}
+ cug-OutgoingAccess NULL OPTIONAL}
NumberOfForwarding ::= INTEGER (1..5)
--<B--ConnectToFollowingAddressArg ::= SEQUENCE {--B>--
--<B-- forwardingData ForwardingData,--B>--
---<B-- msisdn ISDN-AddressString OPTIONAL,--B>--
+--<B-- msisdn ISDN-AddressString OPTIONAL,--B>--
--<B-- cug-CheckInfo CUG-CheckInfo OPTIONAL}--B>--
-- OA1 cug-CheckInfo must be absent in version 1
--<B--ProcessCallWaitingArg ::= SEQUENCE {--B>--
---<B-- msisdn [0] ISDN-AddressString,--B>--
+--<B-- msisdn [0] ISDN-AddressString,--B>--
--<B-- cug-Index [1] CUG-Index OPTIONAL,--B>--
--<B-- gsm-BearerCapability [2] ExternalSignalInfo OPTIONAL,--B>--
--<B-- networkSignalInfo [3] ExternalSignalInfo OPTIONAL,--B>--
@@ -79,9 +79,9 @@ NumberOfForwarding ::= INTEGER (1..5)
--<B-- basicService BasicServiceCode OPTIONAL,--B>--
--<B-- cug-Index [4] CUG-Index OPTIONAL,--B>--
-- OA1 cug-Index must be absent in version 1
---<B-- supressPrefCUG [5] NULL OPTIONAL,--B>--
+--<B-- supressPrefCUG [5] NULL OPTIONAL,--B>--
-- OA1 supressPrefCUG must be absent in version 1
---<B-- supressOutgoingAccess [6] NULL OPTIONAL}--B>--
+--<B-- supressOutgoingAccess [6] NULL OPTIONAL}--B>--
-- OA1 supressOutgoingAccess must be absent in version 1
SendRoutingInfoArg ::= SEQUENCE {
@@ -92,7 +92,7 @@ SendRoutingInfoArg ::= SEQUENCE {
networkSignalInfo [10] ExternalSignalInfo OPTIONAL}
SendRoutingInfoRes ::= SEQUENCE {
- imsi IMSI,
+ imsi IMSI,
routingInfo RoutingInfo,
cug-CheckInfo CUG-CheckInfo OPTIONAL}
-- OA1 cug-CheckInfo must be absent in version 1
@@ -102,18 +102,18 @@ RoutingInfo ::= CHOICE {
forwardingData ForwardingData}
ProvideRoamingNumberArg ::= SEQUENCE {
- imsi [0] IMSI,
+ imsi [0] IMSI,
msc-Number [1] ISDN-AddressString OPTIONAL,
-- OP>1 msc-Number must be present in version greater 1
msisdn [2] ISDN-AddressString OPTIONAL,
previousRoamingNumber [3] ISDN-AddressString OPTIONAL,
- lmsi [4] LMSI OPTIONAL,
+ lmsi [4] LMSI OPTIONAL,
gsm-BearerCapability [5] ExternalSignalInfo OPTIONAL,
networkSignalInfo [6] ExternalSignalInfo OPTIONAL}
--<B--CompleteCallArg ::= SEQUENCE {--B>--
--<B-- msisdnOrIMEI MSISDN-OrIMEI,--B>--
---<B-- category [1] Category OPTIONAL,--B>--
+--<B-- category [1] Category OPTIONAL,--B>--
--<B-- cug-Index [2] CUG-Index OPTIONAL,--B>--
-- NU1 cug-INDEX must not be used in version 1
--<B-- gsm-BearerCapability [3] ExternalSignalInfo OPTIONAL,--B>--
@@ -125,7 +125,10 @@ ProvideRoamingNumberArg ::= SEQUENCE {
-- OA1 cug-CheckInfo must be absent in version 1
--<B--MSISDN-OrIMEI ::= CHOICE {--B>--
---<B-- msisdn [0] ISDN-AddressString,--B>--
---<B-- imei [8] IMEI}--B>--
+--<B-- msisdn [0] ISDN-AddressString,--B>--
+--<B-- imei [8] IMEI}--B>--
-- NU1 imei must not be used in version 1
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-CallHandlingOperations.asn1 b/output/4.3.0/MAP-CallHandlingOperations.asn1
index a767bbb..b9cdfaf 100644
--- a/output/4.3.0/MAP-CallHandlingOperations.asn1
+++ b/output/4.3.0/MAP-CallHandlingOperations.asn1
@@ -1,8 +1,9 @@
-- MODULE 'MAP-CallHandlingOperations' START
MAP-CallHandlingOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CallHandlingOperations (7) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CallHandlingOperations (7)
+ version2 (2)}
DEFINITIONS
@@ -22,7 +23,8 @@ EXPORTS
IMPORTS
OPERATION
-FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+FROM TCAPMessages {
+ ccitt recommendation q 773 modules(2) messages (1)}
SystemFailure,
DataMissing,
@@ -44,8 +46,8 @@ FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
ForwardingViolation,
CUG-Reject
FROM MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
--<B-- InfoForIC-Arg,--B>--
--<B-- ConnectToFollowingAddressArg,--B>--
@@ -56,17 +58,17 @@ FROM MAP-Errors {
ProvideRoamingNumberArg--<B--,--B>--
--<B-- CompleteCallArg--B>--
FROM MAP-CH-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CH-DataTypes (13) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CH-DataTypes (13) version2 (2)}
ISDN-AddressString
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
---<B--SendInfoForIncomingCall ::= OPERATION --Timer m----B>--
+--<B--SendInfoForIncomingCall ::= OPERATION --Timer m----B>--
--<B-- ARGUMENT--B>--
--<B-- infoForIC-Arg InfoForIC-Arg--B>--
--<B-- ERRORS {--B>--
@@ -84,11 +86,11 @@ FROM MAP-CommonDataTypes {
--<B-- ProcessCallWaiting,--B>--
--<B-- ConnectToFollowingAddress}--B>--
---<B--ConnectToFollowingAddress ::= OPERATION --Timer s----B>--
+--<B--ConnectToFollowingAddress ::= OPERATION --Timer s----B>--
--<B-- ARGUMENT--B>--
--<B-- connectToFollowingAddressArg ConnectToFollowingAddressArg--B>--
---<B--ProcessCallWaiting ::= OPERATION --Timer s----B>--
+--<B--ProcessCallWaiting ::= OPERATION --Timer s----B>--
--<B-- ARGUMENT--B>--
--<B-- processCallWaitingArg ProcessCallWaitingArg--B>--
--<B-- -- optional----B>--
@@ -103,7 +105,7 @@ FROM MAP-CommonDataTypes {
--<B-- NoSubscriberReply}--B>--
--<B-- -- NU1 NoSubscriberReply must not be used in version 1----B>--
---<B--SendInfoForOutgoingCall ::= OPERATION --Timer ml----B>--
+--<B--SendInfoForOutgoingCall ::= OPERATION --Timer ml----B>--
--<B-- ARGUMENT--B>--
--<B-- infoForOC-Arg InfoForOC-Arg--B>--
--<B-- ERRORS {--B>--
@@ -138,7 +140,7 @@ SendRoutingInfo ::= OPERATION --Timer m--
CUG-Reject,
ForwardingViolation}
-ProvideRoamingNumber ::= OPERATION --Timer m--
+ProvideRoamingNumber ::= OPERATION --Timer m--
ARGUMENT
provideRoamingNumberArg ProvideRoamingNumberArg
RESULT
@@ -151,7 +153,7 @@ ProvideRoamingNumber ::= OPERATION --Timer m--
AbsentSubscriber,
NoRoamingNumberAvailable}
---<B--CompleteCall ::= OPERATION --Timer ml----B>--
+--<B--CompleteCall ::= OPERATION --Timer ml----B>--
--<B-- ARGUMENT--B>--
--<B-- completeCallArg CompleteCallArg--B>--
--<B-- ERRORS {--B>--
@@ -161,3 +163,6 @@ ProvideRoamingNumber ::= OPERATION --Timer m--
--<B-- NoSubscriberReply,--B>--
--<B-- RadioCongestion}--B>--
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-CommonDataTypes.asn1 b/output/4.3.0/MAP-CommonDataTypes.asn1
index 8398468..1dc204d 100644
--- a/output/4.3.0/MAP-CommonDataTypes.asn1
+++ b/output/4.3.0/MAP-CommonDataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-CommonDataTypes' START
MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
DEFINITIONS
@@ -49,37 +49,38 @@ EXPORTS
IMPORTS
TeleserviceCode
FROM MAP-TS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-TS-Code (19) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-TS-Code (19) version2 (2)}
BearerServiceCode
FROM MAP-BS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-BS-Code (20) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-BS-Code (20) version2 (2)}
;
-- general data types
TBCD-STRING ::= OCTET STRING
- -- This type (Telephony Binary Coded Decimal String) is used to represent
- -- several digits from 0 through 9, *, #, a, b , c, two digits per octet,
- -- each digit encoded 0000 to 1001 (0 to 9), 1010 (*), 1011 (#), 1100 (a),
- -- 1101 (b) or 1110 (c); 1111 used as filler when there is an odd number
- -- of digits.
+ -- This type (Telephony Binary Coded Decimal String) is used to
+ -- represent several digits from 0 through 9, *, #, a, b , c, two
+ -- digits per octet, each digit encoded 0000 to 1001 (0 to 9),
+ -- 1010 (*), 1011 (#), 1100 (a), 1101 (b) or 1110 (c); 1111 used
+ -- as filler when there is an odd number of digits.
-- bits 8765 of octet n encoding digit 2n
-- bits 4321 of octet n encoding digit 2(n-1) +1
AddressString ::= OCTET STRING (SIZE (1..maxAddressLength))
- -- This type is used to represent a number for addressing purposes. It is
- -- composed of
- -- a) one octet for nature of address, and numbering plan indicator.
- -- b) digits of an address encoded as TBCD-String.
+ -- This type is used to represent a number for addressing
+ -- purposes. It is composed of
+ -- a) one octet for nature of address, and numbering plan
+ -- indicator.
+ -- b) digits of an address encoded as TBCD-String.
- -- a) The first octet includes a one bit extension indicator, a 3 bits nature of
- -- address indicator and a 4 bits numbering plan indicator, encoded as
- -- follows:
+ -- a) The first octet includes a one bit extension indicator, a
+ -- 3 bits nature of address indicator and a 4 bits numbering
+ -- plan indicator, encoded as follows:
-- bit 8: 1 (no extension)
@@ -106,10 +107,10 @@ AddressString ::= OCTET STRING (SIZE (1..maxAddressLength))
-- 1001 private numbering plan
-- 1111 reserved for extension
- -- all other values are reserved.
+ -- all other values are reserved.
- -- b) The following octets representing digits of an address encoded as a
- -- TBCD-STRING.
+ -- b) The following octets representing digits of an address
+ -- encoded as a TBCD-STRING.
maxAddressLength INTEGER ::= 20
@@ -126,31 +127,33 @@ maxISDN-SubaddressLength INTEGER ::= 21
ExternalSignalInfo ::= SEQUENCE {
protocolId ProtocolId,
signalInfo SignalInfo}
- -- This data type is defined to allow the Mobile Application Part protocol to
- -- carry information elements defined in other Recommendations/Technical
- -- Specifications without any direct reference to their internal
- -- structure.
-
- -- The data type represents any set of information elements (including tag
- -- and length octets) imported from another signalling protocol. For the
- -- user-network protocol, the set of elements may consist of a complete
- -- layer 3 message. The protocol to which the information elements belong is
- -- indicated by the protocolId element, while the signalling information is
- -- contained in the signalInfo element.
+ -- This data type is defined to allow the Mobile Application Part
+ -- protocol to carry information elements defined in other
+ -- Recommendations/Technical Specifications without any direct
+ -- reference to their internal structure.
+
+ -- The data type represents any set of information elements
+ -- (including tag and length octets) imported from another
+ -- signalling protocol. For the user-network protocol, the set of
+ -- elements may consist of a complete layer 3 message. The
+ -- protocol to which the information elements belong is
+ -- indicated by the protocolId element, while the signalling
+ -- information is contained in the signalInfo element.
SignalInfo ::= OCTET STRING (SIZE (1..maxSignalInfoLength))
maxSignalInfoLength INTEGER ::= 200
- -- This NamedValue represents the theoretical maximum number of octets
- -- which are available to carry a single data type, without requiring
- -- segmentation to cope with the network layer service. However, the actual
- -- maximum size available for a data type may be lower, especially when
- -- other information elements have to be included in the same component.
+ -- This NamedValue represents the theoretical maximum number of
+ -- octets which are available to carry a single data type,
+ -- without requiring segmentation to cope with the network layer
+ -- service. However, the actual maximum size available for a data
+ -- type may be lower, especially when other information elements
+ -- have to be included in the same component.
ProtocolId ::= ENUMERATED {
gsm-0408 (1),
- gsm-0806-DTAP (2),
- gsm-0808-BSSMAP (3),
+ gsm-DTAP (2),
+ gsm-BSSMAP (3),
isup-Q763 (4)}
@@ -162,8 +165,8 @@ IMSI ::= TBCD-STRING (SIZE (3..8))
TMSI ::= OCTET STRING (SIZE (1..4))
SubscriberId ::= CHOICE {
- imsi [0] IMSI,
- tmsi [1] TMSI}
+ imsi [0] IMSI,
+ tmsi [1] TMSI}
IMEI ::= TBCD-STRING (SIZE (8))
-- The internal Structure is defined as follows:
@@ -248,3 +251,6 @@ BasicServiceGroupList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
maxNumOfBasicServiceGroups INTEGER ::= 13
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-DialogueInformation.asn1 b/output/4.3.0/MAP-DialogueInformation.asn1
index 66b99a0..9c4e84c 100644
--- a/output/4.3.0/MAP-DialogueInformation.asn1
+++ b/output/4.3.0/MAP-DialogueInformation.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-DialogueInformation' START
MAP-DialogueInformation {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-DialogueInformation (3) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-DialogueInformation (3) version2 (2)}
DEFINITIONS
@@ -21,8 +21,8 @@ FROM MobileDomainDefinitions {
AddressString
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
@@ -83,9 +83,12 @@ ProcedureCancellationReason ::= ENUMERATED {
MAP-ProviderAbortInfo ::= SEQUENCE {
map-ProviderAbortReason MAP-ProviderAbortReason,
- plmn-specificInfo EXTERNAL OPTIONAL}
+ plmn-specificInfo EXTERNAL OPTIONAL}
MAP-ProviderAbortReason ::= ENUMERATED {
abnormalDialogue (0),
invalidPDU (1)}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-ER-DataTypes.asn1 b/output/4.3.0/MAP-ER-DataTypes.asn1
index f1d2dea..33b8d91 100644
--- a/output/4.3.0/MAP-ER-DataTypes.asn1
+++ b/output/4.3.0/MAP-ER-DataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-ER-DataTypes' START
MAP-ER-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-ER-DataTypes (17) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-ER-DataTypes (17) version2 (2)}
DEFINITIONS
@@ -25,18 +25,18 @@ EXPORTS
IMPORTS
SS-Status
FROM MAP-SS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-DataTypes (14) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-DataTypes (14) version2 (2)}
BasicServiceCode
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
SS-Code
FROM MAP-SS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-Code (15) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-Code (15) version2 (2)}
;
@@ -64,7 +64,8 @@ CUG-RejectCause ::= ENUMERATED {
requestedBasicServiceViolatesCUG-Constraints (5),
noCUG-Selected (6),
calledPartySS-InteractionViolation (7)}
- -- NU1 calledPartySS-InteractionViolation must not be used in version 1
+ -- NU1 calledPartySS-InteractionViolation must not be used in
+ -- version 1
SS-IncompatibilityCause ::= SEQUENCE {
ss-Code [1] SS-Code OPTIONAL,
@@ -85,3 +86,6 @@ SM-DeliveryFailureCause ::= ENUMERATED {
invalidSME-Address (5),
subscriberNotSC-Subscriber (6)}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-Errors.asn1 b/output/4.3.0/MAP-Errors.asn1
index f41822b..a0f6b99 100644
--- a/output/4.3.0/MAP-Errors.asn1
+++ b/output/4.3.0/MAP-Errors.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-Errors' START
MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
DEFINITIONS
@@ -61,7 +61,6 @@ EXPORTS
SS-NotAvailable,
SS-SubscriptionViolation,
SS-Incompatibility,
- SS-PartialAcceptance,
SS-NotDelivered,
PW-RegistrationFailure,
NegativePW-Check,
@@ -74,14 +73,15 @@ EXPORTS
IMPORTS
ERROR
-FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+FROM TCAPMessages {
+ ccitt recommendation q 773 modules(2) messages (1)}
SS-Status,
SS-SubscriptionOption--<B--,--B>--
--<B-- SS-List--B>--
FROM MAP-SS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-DataTypes (14) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-DataTypes (14) version2 (2)}
RoamingNotAllowedCause,
--<B-- BusySubscriberCause,--B>--
@@ -91,13 +91,13 @@ FROM MAP-SS-DataTypes {
PW-RegistrationFailureCause,
SM-DeliveryFailureCause
FROM MAP-ER-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-ER-DataTypes (17) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-ER-DataTypes (17) version2 (2)}
NetworkResource
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
@@ -226,8 +226,6 @@ SS-Incompatibility ::= ERROR
ss-IncompatibilityCause SS-IncompatibilityCause
-- optional
-SS-PartialAcceptance ::= ERROR
-
SS-NotDelivered ::= ERROR
PW-RegistrationFailure ::= ERROR
@@ -247,3 +245,6 @@ SM-DeliveryFailure ::= ERROR
MessageWaitingListFull ::= ERROR
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-MS-DataTypes.asn1 b/output/4.3.0/MAP-MS-DataTypes.asn1
index 14888e3..050eea7 100644
--- a/output/4.3.0/MAP-MS-DataTypes.asn1
+++ b/output/4.3.0/MAP-MS-DataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-MS-DataTypes' START
MAP-MS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-MS-DataTypes (11) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-MS-DataTypes (11) version2 (2)}
DEFINITIONS
@@ -30,6 +30,7 @@ EXPORTS
-- access management types
--<B-- ProcessAccessRequestArg,--B>--
--<B-- ProcessAccessRequestRes,--B>--
+--<B-- IMSI-OrIMEI,--B>--
-- handover types
PerformHO-Arg,
@@ -62,8 +63,8 @@ IMPORTS
SS-List,
SS-InfoList
FROM MAP-SS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-DataTypes (14) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-DataTypes (14) version2 (2)}
TBCD-STRING,
ISDN-AddressString,
@@ -84,8 +85,8 @@ FROM MAP-SS-DataTypes {
TeleserviceList,
BasicServiceList
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
@@ -95,20 +96,21 @@ FROM MAP-CommonDataTypes {
--<B-- subscriberId SubscriberId,--B>--
--<B-- previousLocAreaId LocAreaIdOrNone,--B>--
--<B-- targetLocAreaId LocAreaId,--B>--
---<B-- cksn CKSN OPTIONAL}--B>--
+--<B-- cksn CKSN OPTIONAL}--B>--
--<B-- -- OP1 cksn must be present in version 1----B>--
UpdateLocationArg ::= SEQUENCE {
imsi IMSI,
locationInfo LocationInfo,
vlr-Number ISDN-AddressString,
- lmsi [10] LMSI OPTIONAL}
+ lmsi [10] LMSI OPTIONAL}
UpdateLocationRes ::= CHOICE {
hlr-Number ISDN-AddressString,
-- NU>1 hlr-Number must not be used in version greater 1
- hlr-NumberWithRoamingRestrictions HLR-NumberWithRoamingRestrictions}
- -- NU1 hlr-NumberWithRoamingRestrictions must not be used in version 1
+ hlr-NumberWithRoamingRestrictions HLR-NumberWithRoamingRestrictions}
+ -- NU1 hlr-NumberWithRoamingRestrictions must not be used in
+ -- version 1
HLR-NumberWithRoamingRestrictions ::= SEQUENCE {
hlr-Number ISDN-AddressString,
@@ -123,27 +125,27 @@ ZoneCode ::= TBCD-STRING (SIZE (3..8))
maxNumOfZoneCodes INTEGER ::= 10
CancelLocationArg ::= CHOICE {
- imsi IMSI,
+ imsi IMSI,
imsi-WithLMSI IMSI-WithLMSI}
PurgeMS-Arg ::= SEQUENCE {
- imsi IMSI,
+ imsi IMSI,
vlr-Number ISDN-AddressString}
IMSI-WithLMSI ::= SEQUENCE {
- imsi IMSI,
- lmsi LMSI}
+ imsi IMSI,
+ lmsi LMSI}
SendIdentificationRes ::= SEQUENCE {
- imsi IMSI,
+ imsi IMSI,
authenticationSetList AuthenticationSetList OPTIONAL}
AuthenticationSetList ::= SEQUENCE SIZE (1..5) OF
AuthenticationSet
AuthenticationSet ::= SEQUENCE {
- rand RAND,
- sres SRES,
+ rand RAND,
+ sres SRES,
kc Kc}
RAND ::= OCTET STRING (SIZE (16))
@@ -156,12 +158,12 @@ Kc ::= OCTET STRING (SIZE (8))
-- page management types
--<B--PageArg ::= SEQUENCE {--B>--
---<B-- imsi [0] IMSI,--B>--
---<B-- tmsi [1] TMSI OPTIONAL,--B>--
+--<B-- imsi [0] IMSI,--B>--
+--<B-- tmsi [1] TMSI OPTIONAL,--B>--
--<B-- locAreaId [2] LocAreaId}--B>--
--<B--SearchForMS-Arg ::= SEQUENCE {--B>--
---<B-- imsi IMSI,--B>--
+--<B-- imsi IMSI,--B>--
--<B-- storedLocAreaId LocAreaIdOrNone}--B>--
@@ -171,14 +173,14 @@ Kc ::= OCTET STRING (SIZE (8))
--<B-- subscriberIdOrIMEI SubscriberIdOrIMEI,--B>--
--<B-- cm-ServiceType CM-ServiceType,--B>--
--<B-- accessConnectionStatus AccessConnectionStatus,--B>--
---<B-- cksn CKSN,--B>--
+--<B-- cksn CKSN,--B>--
--<B-- targetLocArea LocAreaId OPTIONAL}--B>--
-- OA1 targetLocAreas must be absent in version 1
-- OP>1 targetLocArea must be present in version greater 1
--<B--SubscriberIdOrIMEI ::= CHOICE {--B>--
--<B-- subscriberID SubscriberId,--B>--
---<B-- imei [2] IMEI}--B>--
+--<B-- imei [2] IMEI}--B>--
-- NU1 imei must not be used in version 1
--<B--CM-ServiceType ::= ENUMERATED {--B>--
@@ -207,11 +209,11 @@ Kc ::= OCTET STRING (SIZE (8))
--<B--ProcessAccessRequestRes ::= SEQUENCE {--B>--
--<B-- imsi-OrIMEI IMSI-OrIMEI,--B>--
---<B-- msisdn ISDN-AddressString OPTIONAL}--B>--
+--<B-- msisdn ISDN-AddressString OPTIONAL}--B>--
--<B--IMSI-OrIMEI ::= CHOICE {--B>--
---<B-- imsi IMSI,--B>--
---<B-- imei [0] IMEI}--B>--
+--<B-- imsi IMSI,--B>--
+--<B-- imei [0] IMEI}--B>--
-- NU1 imei must not be used in version 1
-- handover types
@@ -235,8 +237,8 @@ ChannelType ::= OCTET STRING (SIZE (1..10))
-- as defined in GSM 08.08
ClassmarkInfo ::= OCTET STRING (SIZE (1..2))
- -- classmark information element type 1 or 2 contents as defined in
- -- GSM 08.08
+ -- classmark information element type 1 or 2 contents as defined
+ -- in GSM 08.08
HandoverPriority ::= OCTET STRING (SIZE (1))
-- The internal structure is defined in GSM 08.08.
@@ -258,8 +260,8 @@ PerformSubsequentHO-Arg ::= SEQUENCE {
-- authentication management types
--<B--AuthenticateArg ::= SEQUENCE {--B>--
---<B-- rand RAND,--B>--
---<B-- cksn CKSN}--B>--
+--<B-- rand RAND,--B>--
+--<B-- cksn CKSN}--B>--
--<B--CKSN ::= OCTET STRING (SIZE (1))--B>--
@@ -318,27 +320,27 @@ SentParameterList ::= SEQUENCE SIZE (1..maxNumOfSentParameter) OF
SentParameter
SentParameter ::= CHOICE {
- imsi [0] IMSI,
+ imsi [0] IMSI,
authenticationSet [1] AuthenticationSet,
subscriberData [2] SubscriberData,
ki [4] Ki}
maxNumOfSentParameter INTEGER ::= 6
- -- This NamedValue corresponds to the maximum number of authentication set which may
- -- be returned by a HLR plus 1.
+ -- This NamedValue corresponds to the maximum number of
+ -- authentication set which may be returned by a HLR plus 1
InsertSubscriberDataArg ::= SEQUENCE {
- imsi [0] IMSI OPTIONAL,
+ imsi [0] IMSI OPTIONAL,
COMPONENTS OF SubscriberData}
SubscriberData ::= SEQUENCE {
msisdn [1] ISDN-AddressString OPTIONAL,
- category [2] Category OPTIONAL,
+ category [2] Category OPTIONAL,
subscriberStatus [3] SubscriberStatus OPTIONAL,
bearerServiceList [4] BearerServiceList OPTIONAL,
teleserviceList [6] TeleserviceList OPTIONAL,
provisionedSS [7] SS-InfoList OPTIONAL,
- odb-Data [8] ODB-Data OPTIONAL}
+ odb-Data [8] ODB-Data OPTIONAL}
-- OA1 odb-Data must be absent in version 1
SubscriberStatus ::= ENUMERATED {
@@ -370,7 +372,7 @@ InsertSubscriberDataRes ::= SEQUENCE {
odb-GeneralData [4] ODB-GeneralData OPTIONAL}
DeleteSubscriberDataArg ::= SEQUENCE {
- imsi [0] IMSI,
+ imsi [0] IMSI,
basicServiceList [1] BasicServiceList OPTIONAL,
ss-List [2] SS-List OPTIONAL}
@@ -382,13 +384,16 @@ ResetArg ::= SEQUENCE {
-- OP1 networkResource must be present in version 1
-- OA>1 networkResource must be absent in version greater 1
hlr-Number ISDN-AddressString,
- hlr-List HLR-List OPTIONAL}
+ hlr-List HLR-List OPTIONAL}
RestoreDataArg ::= SEQUENCE {
imsi IMSI,
- lmsi LMSI OPTIONAL}
+ lmsi LMSI OPTIONAL}
RestoreDataRes ::= SEQUENCE {
COMPONENTS OF HLR-NumberWithRoamingRestrictions,
- msNotReachable NULL OPTIONAL}
+ msNotReachable NULL OPTIONAL}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-MobileServiceOperations.asn1 b/output/4.3.0/MAP-MobileServiceOperations.asn1
index d1b5bd5..5cdcf0c 100644
--- a/output/4.3.0/MAP-MobileServiceOperations.asn1
+++ b/output/4.3.0/MAP-MobileServiceOperations.asn1
@@ -1,8 +1,9 @@
-- MODULE 'MAP-MobileServiceOperations' START
MAP-MobileServiceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-MobileServiceOperations (5) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-MobileServiceOperations (5)
+ version2 (2)}
DEFINITIONS
@@ -65,7 +66,8 @@ EXPORTS
IMPORTS
OPERATION
-FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+FROM TCAPMessages {
+ ccitt recommendation q 773 modules(2) messages (1)}
SystemFailure,
DataMissing,
@@ -86,8 +88,8 @@ FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
--<B-- AbsentSubscriber,--B>--
--<B-- BusySubscriber--B>--
FROM MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
--<B-- UpdateLocationAreaArg,--B>--
UpdateLocationArg,
@@ -117,8 +119,8 @@ FROM MAP-Errors {
RestoreDataArg,
RestoreDataRes
FROM MAP-MS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-MS-DataTypes (11) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-MS-DataTypes (11) version2 (2)}
--<B-- ISDN-AddressString,--B>--
ExternalSignalInfo,
@@ -128,14 +130,14 @@ FROM MAP-MS-DataTypes {
IMEI--<B--,--B>--
--<B-- LocAreaId--B>--
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
-- location registration operations
---<B--UpdateLocationArea ::= OPERATION --Timer m----B>--
+--<B--UpdateLocationArea ::= OPERATION --Timer m----B>--
--<B-- ARGUMENT--B>--
--<B-- updateLocationAreaArg UpdateLocationAreaArg--B>--
--<B-- RESULT zzzz-Empty NULL--B>--
@@ -182,7 +184,7 @@ PurgeMS ::= OPERATION --Timer m--
SendIdentification::= OPERATION --Timer s--
ARGUMENT
- tmsi TMSI
+ tmsi TMSI
RESULT
sendIdentificationRes SendIdentificationRes
ERRORS {
@@ -191,11 +193,11 @@ SendIdentification::= OPERATION --Timer s--
--<B--DetachIMSI ::= OPERATION --Timer s----B>--
--<B-- ARGUMENT--B>--
---<B-- subscriberId SubscriberId--B>--
+--<B-- subscriberId SubscriberId--B>--
--<B--AttachIMSI ::= OPERATION --Timer s----B>--
--<B-- ARGUMENT--B>--
---<B-- subscriberId SubscriberId--B>--
+--<B-- subscriberId SubscriberId--B>--
--<B-- RESULT zzzz-Empty NULL--B>--
--<B-- ERRORS {--B>--
--<B-- SystemFailure,--B>--
@@ -238,7 +240,7 @@ SendIdentification::= OPERATION --Timer s--
-- access management operations
---<B--ProcessAccessRequest ::= OPERATION --Timer m----B>--
+--<B--ProcessAccessRequest ::= OPERATION --Timer m----B>--
--<B-- ARGUMENT--B>--
--<B-- proccessAccessRequestArg ProcessAccessRequestArg--B>--
--<B-- RESULT--B>--
@@ -280,15 +282,15 @@ PerformHandover ::= OPERATION --Timer s--
SendEndSignal ::= OPERATION --Timer l--
RESULT zzzz-Empty NULL
-ProcessAccessSignalling ::= OPERATION --Timer s--
+ProcessAccessSignalling ::= OPERATION --Timer s--
ARGUMENT
bss-APDU ExternalSignalInfo
-ForwardAccessSignalling ::= OPERATION --Timer s--
+ForwardAccessSignalling ::= OPERATION --Timer s--
ARGUMENT
bss-APDU ExternalSignalInfo
-PerformSubsequentHandover ::= OPERATION --Timer m--
+PerformSubsequentHandover ::= OPERATION --Timer m--
ARGUMENT
performSubsequentHO-Arg PerformSubsequentHO-Arg
RESULT
@@ -302,13 +304,13 @@ PerformSubsequentHandover ::= OPERATION --Timer m--
InvalidTargetBaseStation,
SubsequentHandoverFailure}
---<B--AllocateHandoverNumber ::= OPERATION --Timer s----B>--
+--<B--AllocateHandoverNumber ::= OPERATION --Timer s----B>--
--<B-- ERRORS {--B>--
--<B-- NoHandoverNumberAvailable}--B>--
--<B-- LINKED {--B>--
--<B-- SendHandoverReport}--B>--
---<B--SendHandoverReport ::= OPERATION --Timer l----B>--
+--<B--SendHandoverReport ::= OPERATION --Timer l----B>--
--<B-- ARGUMENT--B>--
--<B-- handoverNumber ISDN-AddressString--B>--
--<B-- RESULT zzzz-Empty NULL--B>--
@@ -320,9 +322,9 @@ PerformSubsequentHandover ::= OPERATION --Timer m--
--<B-- ARGUMENT--B>--
--<B-- authenticateArg AuthenticateArg--B>--
--<B-- RESULT--B>--
---<B-- sres SRES--B>--
+--<B-- sres SRES--B>--
-SendAuthenticationInfo ::= OPERATION --Timer m--
+SendAuthenticationInfo ::= OPERATION --Timer m--
ARGUMENT
sendAuthenticationInfoArg SendAuthenticationInfoArg
RESULT
@@ -343,9 +345,9 @@ SendAuthenticationInfo ::= OPERATION --Timer m--
-- IMEI management operations
-CheckIMEI ::= OPERATION --Timer m--
+CheckIMEI ::= OPERATION --Timer m--
ARGUMENT
- imei IMEI
+ imei IMEI
-- optional:
-- OP1 imei must be present in version 1
RESULT
@@ -373,14 +375,13 @@ SendParameters ::= OPERATION --Timer m--
RESULT
sentParameterList SentParameterList
-- optional
- -- nothing is returned, if no requested parameter is available or
- -- exists
+ -- nothing is returned, if no requested parameter is available -- or exists
ERRORS {
UnexpectedDataValue,
UnknownSubscriber,
UnidentifiedSubscriber}
-InsertSubscriberData ::= OPERATION --Timer m--
+InsertSubscriberData ::= OPERATION --Timer m--
ARGUMENT
insertSubscriberDataArg InsertSubscriberDataArg
RESULT
@@ -392,7 +393,7 @@ InsertSubscriberData ::= OPERATION --Timer m--
UnexpectedDataValue,
UnidentifiedSubscriber}
-DeleteSubscriberData ::= OPERATION --Timer m--
+DeleteSubscriberData ::= OPERATION --Timer m--
ARGUMENT
deleteSubscriberDataArg DeleteSubscriberDataArg
RESULT zzzz-Empty NULL
@@ -420,11 +421,11 @@ DeleteSubscriberData ::= OPERATION --Timer m--
-- fault recovery operations
-Reset ::= OPERATION --Timer m--
+Reset ::= OPERATION --Timer m--
ARGUMENT
resetArg ResetArg
-ForwardCheckSS-Indication ::= OPERATION --Timer s--
+ForwardCheckSS-Indication ::= OPERATION --Timer s--
RestoreData ::= OPERATION --Timer m--
ARGUMENT
@@ -437,3 +438,6 @@ RestoreData ::= OPERATION --Timer m--
UnexpectedDataValue,
UnknownSubscriber}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-OM-DataTypes.asn1 b/output/4.3.0/MAP-OM-DataTypes.asn1
index 36f817d..9bb137f 100644
--- a/output/4.3.0/MAP-OM-DataTypes.asn1
+++ b/output/4.3.0/MAP-OM-DataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-OM-DataTypes' START
MAP-OM-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-OM-DataTypes (12) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-OM-DataTypes (12) version2 (2)}
DEFINITIONS
@@ -25,34 +25,34 @@ IMPORTS
IMSI,
GlobalCellId
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
+
+ IMSI-OrIMEI
+FROM MAP-MS-DataTypes {
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-MS-DataTypes (11) version2 (2)}
;
ActivateTraceModeArg ::= SEQUENCE {
- imsi [0] IMSI OPTIONAL,
+ imsi [0] IMSI OPTIONAL,
traceReference [1] TraceReference,
traceType [2] TraceType,
omc-Id [3] AddressString OPTIONAL}
TraceReference ::= OCTET STRING (SIZE (1..2))
-TraceType ::= INTEGER {
- allEvents (0),
- onlyCalls (1),
- eventSet1 (2),
- eventSet254 (255)}
+TraceType ::= INTEGER
(0..255)
- -- Identifiers eventSet1 to eventSet254 correspond to sets of events
- -- predefined by each operator.
+ -- Trace types are more fully defined in TS GSM 12.02.
DeactivateTraceModeArg ::= SEQUENCE {
- imsi [0] IMSI OPTIONAL,
+ imsi [0] IMSI OPTIONAL,
traceReference [1] TraceReference}
TraceSubscriberActivityArg ::= SEQUENCE {
- imsi [0] IMSI OPTIONAL,
+ imsi-OrIMEI [0] IMSI-OrIMEI OPTIONAL,
traceReference [1] TraceReference,
traceType [2] TraceType,
omc-Id [3] AddressString OPTIONAL,
@@ -69,3 +69,6 @@ HandoverType ::= ENUMERATED {
interBSS (0),
intraBSS (1)}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-OperationAndMaintenanceOperations.asn1 b/output/4.3.0/MAP-OperationAndMaintenanceOperations.asn1
index 9d92768..a45233e 100644
--- a/output/4.3.0/MAP-OperationAndMaintenanceOperations.asn1
+++ b/output/4.3.0/MAP-OperationAndMaintenanceOperations.asn1
@@ -1,8 +1,9 @@
-- MODULE 'MAP-OperationAndMaintenanceOperations' START
MAP-OperationAndMaintenanceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-OperationAndMaintenanceOperations (6) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-OperationAndMaintenanceOperations (6)
+ version2 (2)}
DEFINITIONS
@@ -20,7 +21,8 @@ EXPORTS
IMPORTS
OPERATION
-FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+FROM TCAPMessages {
+ ccitt recommendation q 773 modules(2) messages (1)}
SystemFailure,
DataMissing,
@@ -30,22 +32,22 @@ FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
UnidentifiedSubscriber,
TracingBufferFull
FROM MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
ActivateTraceModeArg,
DeactivateTraceModeArg,
TraceSubscriberActivityArg,
NoteInternalHO-Arg
FROM MAP-OM-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-OM-DataTypes (12) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-OM-DataTypes (12) version2 (2)}
ISDN-AddressString,
IMSI
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-ComonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-ComonDataTypes (18) version2 (2)}
;
@@ -61,7 +63,7 @@ ActivateTraceMode ::= OPERATION --Timer m--
UnidentifiedSubscriber,
TracingBufferFull}
-DeactivateTraceMode ::= OPERATION --Timer m--
+DeactivateTraceMode ::= OPERATION --Timer m--
ARGUMENT
deactivateTraceModeArg DeactivateTraceModeArg
RESULT zzzz-Empty NULL
@@ -72,21 +74,24 @@ DeactivateTraceMode ::= OPERATION --Timer m--
FacilityNotSupported,
UnidentifiedSubscriber}
-TraceSubscriberActivity ::= OPERATION --Timer s--
+TraceSubscriberActivity ::= OPERATION --Timer s--
ARGUMENT
traceSubscriberActivityArg TraceSubscriberActivityArg
-NoteInternalHandover ::= OPERATION --Timer s--
+NoteInternalHandover ::= OPERATION --Timer s--
ARGUMENT
noteInternalHO-Arg NoteInternalHO-Arg
-SendIMSI ::= OPERATION --Timer m--
+SendIMSI ::= OPERATION --Timer m--
ARGUMENT
- msisdn ISDN-AddressString
+ msisdn ISDN-AddressString
RESULT
- imsi IMSI
+ imsi IMSI
ERRORS {
DataMissing,
UnexpectedDataValue,
UnknownSubscriber}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-Protocol.asn1 b/output/4.3.0/MAP-Protocol.asn1
index 80ea2cb..79fee91 100644
--- a/output/4.3.0/MAP-Protocol.asn1
+++ b/output/4.3.0/MAP-Protocol.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-Protocol' START
MAP-Protocol {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Protocol (4) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Protocol (4) version2 (2)}
DEFINITIONS
@@ -42,8 +42,9 @@ IMPORTS
ForwardCheckSS-Indication,
RestoreData
FROM MAP-MobileServiceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-MobileServiceOperations (5) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-MobileServiceOperations (5)
+ version2 (2)}
ActivateTraceMode,
DeactivateTraceMode,
@@ -51,8 +52,9 @@ FROM MAP-MobileServiceOperations {
NoteInternalHandover,
SendIMSI
FROM MAP-OperationAndMaintenanceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-OperationAndMaintenanceOperations (6) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-OperationAndMaintenanceOperations (6)
+ version2 (2)}
--<B-- SendInfoForIncomingCall,--B>--
--<B-- ConnectToFollowingAddress,--B>--
@@ -62,8 +64,9 @@ FROM MAP-OperationAndMaintenanceOperations {
ProvideRoamingNumber--<B--,--B>--
--<B-- CompleteCall--B>--
FROM MAP-CallHandlingOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CallHandlingOperaations (7) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CallHandlingOperaations (7)
+ version2 (2)}
RegisterSS,
EraseSS,
@@ -80,8 +83,9 @@ FROM MAP-CallHandlingOperations {
GetPassword,
BeginSubscriberActivity
FROM MAP-SupplementaryServiceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SupplementaryServiceOperations (8) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SupplementaryServiceOperations (8)
+ version2 (2)}
SendRoutingInfoForSM,
ForwardSM,
@@ -93,8 +97,9 @@ FROM MAP-SupplementaryServiceOperations {
--<B-- SendInfoForMO-SMS,--B>--
ReadyForSM
FROM MAP-ShortMessageServiceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-ShortMessageServieOperations (9) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-ShortMessageServieOperations (9)
+ version2 (2)}
SystemFailure,
DataMissing,
@@ -132,7 +137,6 @@ FROM MAP-ShortMessageServiceOperations {
SS-NotAvailable,
SS-SubscriptionViolation,
SS-Incompatibility,
- SS-PartialAcceptance,
SS-NotDelivered,
PW-RegistrationFailure,
NegativePW-Check,
@@ -140,8 +144,8 @@ FROM MAP-ShortMessageServiceOperations {
SM-DeliveryFailure,
MessageWaitingListFull
FROM MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
;
@@ -300,8 +304,6 @@ ss-ErrorStatus SS-ErrorStatus ::= localValue 17
ss-NotAvailable SS-NotAvailable ::= localValue 18
ss-SubscriptionViolation SS-SubscriptionViolation ::= localValue 19
ss-Incompatibility SS-Incompatibility ::= localValue 20
-ss-PartialAcceptance SS-PartialAcceptance ::= localValue 41
--- NU1 ss-PartialAcceptance must not be used in version 1
ss-NotDelivered SS-NotDelivered ::= localValue 42
-- NU1 ss-NotDelivered must not be used in version 1
pw-RegistrationFailure PW-RegistrationFailure ::= localValue 37
@@ -315,3 +317,6 @@ numberOfPW-AttemptsViolation NumberOfPW-AttemptsViolation ::= localValue 43
sm-DeliveryFailure SM-DeliveryFailure ::= localValue 32
messageWaitingListFull MessageWaitingListFull ::= localValue 33
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-SM-DataTypes.asn1 b/output/4.3.0/MAP-SM-DataTypes.asn1
index 16a2d41..f1e5d00 100644
--- a/output/4.3.0/MAP-SM-DataTypes.asn1
+++ b/output/4.3.0/MAP-SM-DataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-SM-DataTypes' START
MAP-SM-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SM-DataTypes (16) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SM-DataTypes (16) version2 (2)}
DEFINITIONS
@@ -33,13 +33,13 @@ IMPORTS
TeleserviceCode, (CR202)
LMSI
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
TeleserviceCode
FROM MAP-TS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-TS-Code (19) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-TS-Code (19) version2 (2)}
;
@@ -52,7 +52,7 @@ RoutingInfoForSM-Arg ::= SEQUENCE {
RoutingInfoForSM-Res::= SEQUENCE {
- imsi IMSI,
+ imsi IMSI,
locationInfoWithLMSI LocationInfoWithLMSI,
mwd-Set [2] BOOLEAN OPTIONAL}
-- OA>1 mwd-Set must be absent in version greater 1
@@ -60,18 +60,18 @@ RoutingInfoForSM-Res::= SEQUENCE {
LocationInfoWithLMSI ::= SEQUENCE {
locationInfo LocationInfo,
- lmsi LMSI OPTIONAL}
+ lmsi LMSI OPTIONAL}
ForwardSM-Arg ::= SEQUENCE {
- sm-RP-DA SM-RP-DA,
- sm-RP-OA SM-RP-OA,
- sm-RP-UI SignalInfo,
- moreMessagesToSend NULL OPTIONAL}
+ sm-RP-DA SM-RP-DA,
+ sm-RP-OA SM-RP-OA,
+ sm-RP-UI SignalInfo,
+ moreMessagesToSend NULL OPTIONAL}
-- OA1 moreMessagesToSend must be absent in version 1
SM-RP-DA ::= CHOICE {
- imsi [0] IMSI,
- lmsi [1] LMSI,
+ imsi [0] IMSI,
+ lmsi [1] LMSI,
roamingNumber [3] ISDN-AddressString,
serviceCentreAddressDA [4] AddressString,
noSM-SP-DA [5] NULL}
@@ -100,8 +100,8 @@ AlertServiceCentreArg ::= SEQUENCE {
serviceCentreAddress AddressString}
InformServiceCentreArg ::= SEQUENCE {
- storedMSISDN ISDN-AddressString OPTIONAL,
- mw-Status MW-Status OPTIONAL}
+ storedMSISDN ISDN-AddressString OPTIONAL,
+ mw-Status MW-Status OPTIONAL}
MW-Status ::= BIT STRING {
sc-AddressNotIncluded (0),
@@ -116,3 +116,6 @@ AlertReason ::= ENUMERATED {
ms-Present (0),
memoryAvailable (1)}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-SS-Code.asn1 b/output/4.3.0/MAP-SS-Code.asn1
index 6add9cb..43761cf 100644
--- a/output/4.3.0/MAP-SS-Code.asn1
+++ b/output/4.3.0/MAP-SS-Code.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-SS-Code' START
MAP-SS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-Code (15) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-Code (15) version2 (2)}
DEFINITIONS
@@ -11,98 +11,100 @@ DEFINITIONS
BEGIN
SS-Code ::= OCTET STRING (SIZE (1))
- -- This type is used to represent the code identifying a single supplementary
- -- service, a group of supplementary services, or all supplementary services.
- -- The services and abbreviations used are defined in GSM02.04.
- -- The internal structure is defined as follows:
+ -- This type is used to represent the code identifying a single
+ -- supplementary service, a group of supplementary services, or
+ -- all supplementary services. The services and abbreviations
+ -- used are defined in GSM02.04. The internal structure is
+ -- defined as follows:
- -- bits 87654321: group (bits 8765), and specific service (bits 4321)
+ -- bits 87654321: group (bits 8765), and specific service
+ -- (bits 4321)
allSS SS-Code ::= '00000000'B
-- all SS
allLineIdentificationSS SS-Code ::= '00010000'B
- -- all line identification SS
+ -- all line identification SS
clip SS-Code ::= '00010001'B
- -- calling line identification presentation
+ -- calling line identification presentation
clir SS-Code ::= '00010010'B
- -- calling line identification restriction
+ -- calling line identification restriction
colp SS-Code ::= '00010011'B
- -- connected line identification presentation
+ -- connected line identification presentation
colr SS-Code ::= '00010100'B
- -- connected line identification restriction
+ -- connected line identification restriction
mci SS-Code ::= '00010101'B
- -- malicious call identification
+ -- malicious call identification
allForwardingSS SS-Code ::= '00100000'B
- -- all forwarding SS
+ -- all forwarding SS
cfu SS-Code ::= '00100001'B
- -- call forwarding unconditional
+ -- call forwarding unconditional
allCondForwardingSS SS-Code ::= '00101000'B
- -- all conditional forwarding SS
+ -- all conditional forwarding SS
cfb SS-Code ::= '00101001'B
- -- call forwarding on mobile subscriber busy
+ -- call forwarding on mobile subscriber busy
cfnry SS-Code ::= '00101010'B
- -- call forwarding on no reply
+ -- call forwarding on no reply
cfnrc SS-Code ::= '00101011'B
- -- call forwarding on mobile subscriber not reachable
+ -- call forwarding on mobile subscriber not reachable
allCallOfferingSS SS-Code ::= '00110000'B
- -- all call offering SS includes also all forwarding SS
+ -- all call offering SS includes also all forwarding SS
ct SS-Code ::= '00110001'B
- -- call transfer
+ -- call transfer
mah SS-Code ::= '00110010'B
- -- mobile access hunting
+ -- mobile access hunting
allCallCompletionSS SS-Code ::= '01000000'B
- -- all Call completion SS
+ -- all Call completion SS
cw SS-Code ::= '01000001'B
- -- call waiting
+ -- call waiting
hold SS-Code ::= '01000010'B
- -- call hold
+ -- call hold
ccbs SS-Code ::= '01000011'B
- -- completion of call to busy subscribers
+ -- completion of call to busy subscribers
allMultiPartySS SS-Code ::= '01010000'B
- -- all multi-party SS
+ -- all multi-party SS
multiPTY SS-Code ::= '01010001'B
- -- multi party
+ -- multi party
allCommunityOfInterest-SS SS-Code ::= '01100000'B
- -- all community of interest SS
+ -- all community of interest SS
cug SS-Code ::= '01100001'B
- -- closed user group
+ -- closed user group
allChargingSS SS-Code ::= '01110000'B
- -- all charging SS
+ -- all charging SS
aoci SS-Code ::= '01110001'B
- -- advice of charge information
+ -- advice of charge information
aocc SS-Code ::= '01110010'B
- -- advice of charge charging
+ -- advice of charge charging
allAdditionalInfoTransferSS SS-Code ::= '10000000'B
- -- all additional information transfer SS
+ -- all additional information transfer SS
uus SS-Code ::= '10000001'B
- -- UUS user to user signalling
+ -- UUS user to user signalling
allCallRestrictionSS SS-Code ::= '10010000'B
- -- all call restriction SS
+ -- all call restriction SS
barringOfOutgoingCalls SS-Code ::= '10010001'B
- -- barring of outgoing calls
+ -- barring of outgoing calls
baoc SS-Code ::= '10010010'B
- -- barring of all outgoing calls
+ -- barring of all outgoing calls
boic SS-Code ::= '10010011'B
- -- barring of outgoing international calls
+ -- barring of outgoing international calls
boicExHC SS-Code ::= '10010100'B
- -- barring of outgoing international calls except those directed
- -- to the home PLMN
+ -- barring of outgoing international calls except those directed
+ -- to the home PLMN
barringOfIncomingCalls SS-Code ::= '10011001'B
- -- barring of incoming calls
+ -- barring of incoming calls
baic SS-Code ::= '10011010'B
- -- barring of all incoming calls
+ -- barring of all incoming calls
bicRoam SS-Code ::= '10011011'B
- -- barring of incoming calls when roaming outside home PLMN
- -- Country
+ -- barring of incoming calls when roaming outside home PLMN
+ -- Country
allPLMN-specificSS SS-Code ::= '11110000'B
-- NU1 *plmn-specific* must not be used in version 1
@@ -122,3 +124,6 @@ plmn-specificSS-D SS-Code ::= '11111101'B
plmn-specificSS-E SS-Code ::= '11111110'B
plmn-specificSS-F SS-Code ::= '11111111'B
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-SS-DataTypes.asn1 b/output/4.3.0/MAP-SS-DataTypes.asn1
index 2ea6249..e1f8b34 100644
--- a/output/4.3.0/MAP-SS-DataTypes.asn1
+++ b/output/4.3.0/MAP-SS-DataTypes.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-SS-DataTypes' START
MAP-SS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-DataTypes (14) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-DataTypes (14) version2 (2)}
DEFINITIONS
@@ -32,7 +32,6 @@ EXPORTS
Password,
GuidanceInfo,
BeginSubscriberActivityArg,
-
SS-List,
SS-InfoList,
--<B-- SS-DataList,--B>--
@@ -50,13 +49,13 @@ IMPORTS
BasicServiceGroupList,
maxNumOfBasicServiceGroups
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
SS-Code
FROM MAP-SS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-Code (15) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-Code (15) version2 (2)}
;
@@ -85,7 +84,7 @@ ForwardingFeatureList ::= SEQUENCE SIZE (1..maxNumOfBasicServiceGroups) OF
ForwardingFeature ::= SEQUENCE {
basicService BasicServiceCode OPTIONAL,
- ss-Status [4] SS-Status OPTIONAL,
+ ss-Status [4] SS-Status OPTIONAL,
-- OP1 ss-Status must be present in version 1
forwardedToNumber [5] ISDN-AddressString OPTIONAL,
forwardedToSubaddress [8] ISDN-SubaddressString OPTIONAL,
@@ -209,13 +208,9 @@ SS-Data ::= SEQUENCE {
-- OA1 basicServiceGroupList must be absent in version 1
SS-SubscriptionOption ::= CHOICE {
- presentationMode [0] PresentationMode,
+ restrictionPerCall [5] BOOLEAN,
overrideCategory [1] OverrideCategory}
-PresentationMode ::= ENUMERATED {
- presentationPermanent (0),
- presentationPerCall (1)}
-
OverrideCategory ::= ENUMERATED {
overrideEnabled (0),
overrideDisabled (1)}
@@ -241,8 +236,8 @@ ProcessSS-RequestArg ::= SEQUENCE {
SS-FeatureAccessCode ::= OCTET STRING (SIZE (1..2))
EquipmentType ::= SEQUENCE {
- displayDeviceExists NULL OPTIONAL,
- imei IMEI}
+ displayDeviceExists NULL OPTIONAL,
+ imei IMEI}
SS-SpecificInfo ::= CHOICE {
ss-unstructuredInfo [1] SS-UnstructuredInfo,
@@ -257,7 +252,7 @@ SS-DigitString ::= IA5String
ToneOrDisplay ::= CHOICE {
nonRegisteredDisplay [0] SS-DisplayString,
preRegisteredDisplay [1] SS-StringReference,
- tone [2] Tone}
+ tone [2] Tone}
SS-DisplayString ::= PrintableString (SIZE (1..32))
@@ -291,11 +286,12 @@ GuidanceInfo ::= ENUMERATED {
enterPW (0),
enterNewPW (1),
enterNewPW-Again (2)}
- -- How this information is really delivered to the subscriber (display,
- -- announcement, ...) is not part of this specification.
+ -- How this information is really delivered to the subscriber
+ -- (display, announcement, ...) is not part of this
+ -- specification.
BeginSubscriberActivityArg ::= SEQUENCE {
- imsi IMSI,
+ imsi IMSI,
originatingEntityNumber ISDN-AddressString}
SS-List ::= SEQUENCE SIZE (1..maxNumOfSS) OF
@@ -316,3 +312,6 @@ ForwardingData ::= SEQUENCE {
-- OA1 forwardedToSubaddress must be absent in version 1
forwardingOptions [6] ForwardingOptions OPTIONAL}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-ShortMessageServiceOperations.asn1 b/output/4.3.0/MAP-ShortMessageServiceOperations.asn1
index 943824a..f118edc 100644
--- a/output/4.3.0/MAP-ShortMessageServiceOperations.asn1
+++ b/output/4.3.0/MAP-ShortMessageServiceOperations.asn1
@@ -1,8 +1,9 @@
-- MODULE 'MAP-ShortMessageServiceOperations' START
MAP-ShortMessageServiceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-ShortMessageServiceOperations (9) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-ShortMessageServiceOperations (9)
+ version2 (2)}
DEFINITIONS
@@ -24,7 +25,8 @@ EXPORTS
IMPORTS
OPERATION
-FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+FROM TCAPMessages {
+ ccitt recommendation q 773 modules(2) messages (1)}
SystemFailure,
DataMissing,
@@ -40,8 +42,8 @@ FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
SM-DeliveryFailure,
MessageWaitingListFull
FROM MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
RoutingInfoForSM-Arg,
RoutingInfoForSM-Res,
@@ -52,19 +54,19 @@ FROM MAP-Errors {
InformServiceCentreArg,
ReadyForSM-Arg
FROM MAP-SM-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SM-DataTypes (16) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SM-DataTypes (16) version2 (2)}
--<B-- AddressString,--B>--
ISDN-AddressString,
IMSI
FROM MAP-CommonDataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-CommonDataTypes (18) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-CommonDataTypes (18) version2 (2)}
;
-SendRoutingInfoForSM ::= OPERATION --Timer m--
+SendRoutingInfoForSM ::= OPERATION --Timer m--
ARGUMENT
routingInfoForSM-Arg RoutingInfoForSM-Arg
RESULT
@@ -79,7 +81,7 @@ SendRoutingInfoForSM ::= OPERATION --Timer m--
AbsentSubscriber,
CallBarred}
-ForwardSM ::= OPERATION --Timer m--
+ForwardSM ::= OPERATION --Timer ml--
ARGUMENT
forwardSM-Arg ForwardSM-Arg
RESULT zzzz-Empty NULL
@@ -96,7 +98,7 @@ ForwardSM ::= OPERATION --Timer m--
AbsentSubscriber,
SM-DeliveryFailure}
-ReportSM-DeliveryStatus ::= OPERATION --Timer s--
+ReportSM-DeliveryStatus ::= OPERATION --Timer s--
ARGUMENT
reportSM-DeliveryStatusArg ReportSM-DeliveryStatusArg
RESULT
@@ -111,11 +113,11 @@ ReportSM-DeliveryStatus ::= OPERATION --Timer s--
UnknownSubscriber,
MessageWaitingListFull}
-NoteSubscriberPresent ::= OPERATION --Timer s--
+NoteSubscriberPresent ::= OPERATION --Timer s--
ARGUMENT
- imsi IMSI
+ imsi IMSI
-AlertServiceCentre ::= OPERATION --Timer s--
+AlertServiceCentre ::= OPERATION --Timer s--
ARGUMENT
alertServiceCentreArg AlertServiceCentreArg
RESULT zzzz-Empty NULL
@@ -129,7 +131,7 @@ AlertServiceCentre ::= OPERATION --Timer s--
UnexpectedDataValue}
-- NU1 UnexpectedDataValue must not be used in version 1
-InformServiceCentre ::= OPERATION --Timer s--
+InformServiceCentre ::= OPERATION --Timer s--
ARGUMENT
informServiceCentreArg InformServiceCentreArg
@@ -168,3 +170,6 @@ ReadyForSM ::= OPERATION --Timer m--
UnexpectedDataValue,
UnknownSubscriber}
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-SupplementaryServiceOperations.asn1 b/output/4.3.0/MAP-SupplementaryServiceOperations.asn1
index d8d22e9..3237b1b 100644
--- a/output/4.3.0/MAP-SupplementaryServiceOperations.asn1
+++ b/output/4.3.0/MAP-SupplementaryServiceOperations.asn1
@@ -1,8 +1,9 @@
-- MODULE 'MAP-SupplementaryServiceOperations' START
MAP-SupplementaryServiceOperations {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SupplementaryServiceOperations (8) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SupplementaryServiceOperations (8)
+ version2 (2)}
DEFINITIONS
@@ -29,7 +30,8 @@ EXPORTS
IMPORTS
OPERATION
-FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
+FROM TCAPMessages {
+ ccitt recommendation q 773 modules(2) messages (1)}
SystemFailure,
DataMissing,
@@ -45,14 +47,13 @@ FROM TCAPMessages {ccitt recommendation q 773 modules(2) messages (1)}
SS-NotAvailable,
SS-SubscriptionViolation,
SS-Incompatibility,
- SS-PartialAcceptance,
SS-NotDelivered,
PW-RegistrationFailure,
NegativePW-Check,
NumberOfPW-AttemptsViolation
FROM MAP-Errors {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-Errors (10) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-Errors (10) version2 (2)}
RegisterSS-Arg,
SS-Info,
@@ -69,13 +70,13 @@ FROM MAP-Errors {
GuidanceInfo,
BeginSubscriberActivityArg
FROM MAP-SS-DataTypes {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-DataTypes (14) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-DataTypes (14) version2 (2)}
SS-Code
FROM MAP-SS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-SS-Code (15) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-SS-Code (15) version2 (2)}
;
@@ -101,11 +102,9 @@ RegisterSS ::= OPERATION --Timer m--
SS-ErrorStatus,
SS-NotAvailable,
SS-SubscriptionViolation,
- SS-Incompatibility,
- SS-PartialAcceptance}
- -- NU1 SS-PartialAcceptance must not be used in version 1
+ SS-Incompatibility,}
-EraseSS ::= OPERATION --Timer m--
+EraseSS ::= OPERATION --Timer m--
ARGUMENT
ss-ForBS SS-ForBS-Code
RESULT
@@ -148,8 +147,6 @@ ActivateSS ::= OPERATION --Timer m--
SS-NotAvailable,
SS-SubscriptionViolation,
SS-Incompatibility,
- SS-PartialAcceptance,
- -- NU1 SS-PartialAcceptance must not be used in version 1
NegativePW-Check,
NumberOfPW-AttemptsViolation}
@@ -196,7 +193,7 @@ InterrogateSS ::= OPERATION --Timer m--
SS-NotAvailable}
-- NU>1 SS-NotAvailable must not be used in version greater 1
---<B--InvokeSS ::= OPERATION --Timer m----B>--
+--<B--InvokeSS ::= OPERATION --Timer m----B>--
--<B-- ARGUMENT--B>--
--<B-- ss-ForBS SS-ForBS-Code--B>--
--<B-- RESULT zzzz-Empty NULL--B>--
@@ -210,7 +207,7 @@ InterrogateSS ::= OPERATION --Timer m--
--<B-- SS-ErrorStatus,--B>--
--<B-- SS-NotAvailable}--B>--
-ProcessUnstructuredSS-Data ::= OPERATION --Timer m--
+ProcessUnstructuredSS-Data ::= OPERATION --Timer m--
ARGUMENT
ss-UserData SS-UserData
RESULT
@@ -222,7 +219,7 @@ ProcessUnstructuredSS-Data ::= OPERATION --Timer m--
-- NU1 DataMissing must not be used in version 1
UnexpectedDataValue}
-ProcessSS-Request ::= OPERATION --Timer ml--
+ProcessSS-Request ::= OPERATION --Timer ml--
ARGUMENT
processSS-RequestArg ProcessSS-RequestArg
RESULT
@@ -234,19 +231,19 @@ ProcessSS-Request ::= OPERATION --Timer ml--
UnknownSubscriber,
CallBarred}
-SS-GetDigits ::= OPERATION --Timer ml--
+SS-GetDigits ::= OPERATION --Timer ml--
ARGUMENT
ss-GetDigitsArg SS-GetDigitsArg
RESULT
ss-DigitString SS-DigitString
-SS-GetString ::= OPERATION --Timer ml--
+SS-GetString ::= OPERATION --Timer ml--
ARGUMENT
ss-GetStringArg SS-GetStringArg
RESULT
ss-GetStringRes SS-GetStringRes
-UnstructuredNotifySS ::= OPERATION --Timer ml--
+UnstructuredNotifySS ::= OPERATION --Timer ml--
ARGUMENT
toneOrDisplay ToneOrDisplay
ERRORS {
@@ -283,7 +280,10 @@ GetPassword ::= OPERATION --Timer m--
RESULT
currentPassword Password
-BeginSubscriberActivity ::= OPERATION --Timer m--
+BeginSubscriberActivity ::= OPERATION --Timer m--
ARGUMENT
beginSubscriberActivityArg BeginSubscriberActivityArg
+
+END
+-- MODULE END
diff --git a/output/4.3.0/MAP-TS-Code.asn1 b/output/4.3.0/MAP-TS-Code.asn1
index 046f6d0..1db322d 100644
--- a/output/4.3.0/MAP-TS-Code.asn1
+++ b/output/4.3.0/MAP-TS-Code.asn1
@@ -1,8 +1,8 @@
-- MODULE 'MAP-TS-Code' START
MAP-TS-Code {
- ccitt identified-organization (4) etsi (0) mobileDomainId (0) gsmNetworkId(1)
- moduleId (3) map-TS-Code (19) version2 (2)}
+ ccitt identified-organization (4) etsi (0) mobileDomainId (0)
+ gsmNetworkId(1) moduleId (3) map-TS-Code (19) version2 (2)}
DEFINITIONS
@@ -11,12 +11,13 @@ DEFINITIONS
BEGIN
TeleserviceCode ::= OCTET STRING (SIZE (1))
- -- This type is used to represent the code identifying a single teleservice, a
- -- group of teleservices, or all teleservices. The services are defined in
- -- GSM 02.03.
+ -- This type is used to represent the code identifying a single
+ -- teleservice, a group of teleservices, or all teleservices. The
+ -- services are defined in GSM 02.03.
-- The internal structure is defined as follows:
- -- bits 87654321: group (bits 8765) and specific service (bits 4321)
+ -- bits 87654321: group (bits 8765) and specific service
+ -- (bits 4321)
allTeleservices TeleserviceCode ::= '00000000'B
@@ -28,10 +29,9 @@ allShortMessageServices TeleserviceCode ::= '00100000'B
shortMessageMT-PP TeleserviceCode ::= '00100001'B
shortMessageMO-PP TeleserviceCode ::= '00100010'B
-
allTeletextTransmissionServices TeleserviceCode ::= '01010000'B
-teletex TeleserviceCode ::= '01010001'B
-teletexISDN TeleserviceCode ::= '01010010'B
+teletex TeleserviceCode ::= '01010001'B
+teletexISDN TeleserviceCode ::= '01010010'B
-- NU1 teletexISDN must not be used in version 1
allFacsimileTransmissionServices TeleserviceCode ::= '01100000'B
@@ -40,6 +40,21 @@ automaticFacsimileGroup3 TeleserviceCode ::= '01100010'B
facsimileGroup4 TeleserviceCode ::= '01100011'B
-- NU1 facsimileGroup4 must not be used in version 1
+-- NU1 The following non-hierarchical Compound Teleservice Groups
+-- are defined in TS GSM 02.30:
+allDataTeleservices TeleserviceCode ::= '01110000'B
+ -- covers Teleservice Groups 'allFacsimileTransmissionServices'
+ -- and 'allShortMessageServices'
+allTeleservices-ExeptSMS TeleserviceCode ::= '10000000'B
+ -- covers Teleservice Groups 'allSpeechTransmissionServices' and
+ -- 'allFacsimileTransmissionServices'
+--
+-- NU1 Compound Teleservice Group Codes are only used in call
+-- NU1 independent supplementary service operations, ie they
+-- NU1 are not used in InsertSubscriberData or in
+-- NU1 DeleteSubscriberData messages. Compound Teleservice Group
+-- NU1 Codes must not be used in version 1.
+
allPLMN-specificTS TeleserviceCode ::= '11010000'B
-- NU1 *plmn-specific* must not be used in version 1
plmn-specificTS-1 TeleserviceCode ::= '11010001'B
@@ -58,3 +73,6 @@ plmn-specificTS-D TeleserviceCode ::= '11011101'B
plmn-specificTS-E TeleserviceCode ::= '11011110'B
plmn-specificTS-F TeleserviceCode ::= '11011111'B
+
+END
+-- MODULE END