mwdMngtContext: Introduce a v2 of the context

6 files changed, 51 insertions, 16 deletions

diff --git a/asn1/MAP-ApplicationContexts.asn b/asn1/MAP-ApplicationContexts.asn
index ef3230f..9f57718 100644
--- a/asn1/MAP-ApplicationContexts.asn
+++ b/asn1/MAP-ApplicationContexts.asn
@@ -57,6 +57,7 @@ IMPORTS
    mo-ShortMsgRelayPackage-v2,
    mo-ShortMsgRelayPackage-v3,
    alertingPackage-v2,
+   mwdMngtPackage-v2,
    mwdMngtPackage-v3,
    mt-ShortMsgRelayPackage-v3,
    purgingPackage-v3,
@@ -304,6 +305,13 @@ shortMsgAlertContext-v2 APPLICATION-CONTEXT ::= {
     alertingPackage-v2}
  ID {map-ac shortMsgAlert(23) version2(2)} }
 
+mwdMngtContext-v2 APPLICATION-CONTEXT ::= {
+    -- Responder is HLR if Initiator is SGSN
+    -- Responder is HLR if Initiator is VLR
+    INITIATOR CONSUMER OF {
+    mwdMngtPackage-v2}
+ ID {map-ac mwdMngt(24) version2(2)} }
+
 mwdMngtContext-v3 APPLICATION-CONTEXT ::= {
     -- Responder is HLR if Initiator is SGSN
     -- Responder is HLR if Initiator is VLR
diff --git a/asn1/MAP-OperationPackages.asn b/asn1/MAP-OperationPackages.asn
index ffd6a5d..e9f8fe4 100644
--- a/asn1/MAP-OperationPackages.asn
+++ b/asn1/MAP-OperationPackages.asn
@@ -124,7 +124,8 @@ FROM MAP-SupplementaryServiceOperations {
 	-- End [HW]
 	informServiceCentreV2,
 	informServiceCentreV3,
-	readyForSM,
+	readyForSMV2,
+	readyForSMV3,
 	mt-ForwardSM-VGCS
 FROM MAP-ShortMessageServiceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -432,11 +433,16 @@ mt-ShortMsgRelayPackage-v3  OPERATION-PACKAGE ::= {
 		mt-ForwardSM} }
 -- The v2-equivalent package is: shortMsgRelayPackage-v2
 
+mwdMngtPackage-v2  OPERATION-PACKAGE ::= {
+	-- Supplier is HLR if Consumer is SGSN
+	-- Supplier is HLR if Consumer is VLR
+	CONSUMER INVOKES {
+		readyForSMV2} }
 mwdMngtPackage-v3  OPERATION-PACKAGE ::= {
 	-- Supplier is HLR if Consumer is SGSN
 	-- Supplier is HLR if Consumer is VLR
 	CONSUMER INVOKES {
-		readyForSM} }
+		readyForSMV3} }
 -- mwdMngtPackage-v1  OPERATION-PACKAGE ::= {
 	-- Supplier is HLR if Consumer is VLR
 --	CONSUMER INVOKES {
diff --git a/asn1/MAP-Protocol.asn b/asn1/MAP-Protocol.asn
index 9f1c8c8..c854978 100644
--- a/asn1/MAP-Protocol.asn
+++ b/asn1/MAP-Protocol.asn
@@ -118,7 +118,8 @@ FROM MAP-SupplementaryServiceOperations {
 	-- End [HW]
 	informServiceCentreV2,
 	informServiceCentreV3,
-	readyForSM,
+	readyForSMV2,
+	readyForSMV3,
 	mt-ForwardSM-VGCS
 FROM MAP-ShortMessageServiceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -172,7 +173,7 @@ registerPassword | getPassword | ss-InvocationNotification | registerCC-Entry |
 sendRoutingInfoForSMV2 |reportSM-DeliveryStatusV2 | informServiceCentreV2 |
 sendRoutingInfoForSMV3 |reportSM-DeliveryStatusV3 | informServiceCentreV3 |
 mo-ForwardSM | mt-ForwardSM |
-alertServiceCentre | readyForSM | prepareGroupCall | 
+alertServiceCentre | readyForSMV2 | readyForSMV3 | prepareGroupCall | 
 processGroupCallSignalling | forwardGroupCallSignalling | sendGroupCallEndSignal |
 provideSubscriberLocation | sendRoutingInfoForLCS | subscriberLocationReport | 
 releaseResources | mt-ForwardSM-VGCS | sendGroupCallInfo
diff --git a/asn1/MAP-SM-DataTypes.asn b/asn1/MAP-SM-DataTypes.asn
index 35a7330..bc0ef47 100644
--- a/asn1/MAP-SM-DataTypes.asn
+++ b/asn1/MAP-SM-DataTypes.asn
@@ -31,8 +31,9 @@ EXPORTS
 	AlertServiceCentreArg,
 	InformServiceCentreArgV2,
 	InformServiceCentreArgV3,
-	ReadyForSM-Arg, 
-	ReadyForSM-Res,
+	ReadyForSM-ArgV2,
+	ReadyForSM-ArgV3,
+	ReadyForSM-ResV3,
 	SM-DeliveryOutcome,
 	AlertReason,
 	Additional-Number,
@@ -269,7 +270,13 @@ MW-Status ::= BIT STRING {
 	-- exception handling:
 	-- bits 4 to 15 shall be ignored if received and not understood
 
-ReadyForSM-Arg ::= SEQUENCE {
+ReadyForSM-ArgV2 ::= SEQUENCE {
+	imsi			[0] IMSI,
+	alertReason	AlertReason,
+	...
+}
+
+ReadyForSM-ArgV3 ::= SEQUENCE {
 	imsi			[0] IMSI,
 	alertReason	AlertReason,
 	alertReasonIndicator	NULL			OPTIONAL,
@@ -282,7 +289,7 @@ ReadyForSM-Arg ::= SEQUENCE {
 	-- sent to HLR is for IP-SM-GW
 	}
 
-ReadyForSM-Res ::= SEQUENCE {
+ReadyForSM-ResV3 ::= SEQUENCE {
 	extensionContainer	ExtensionContainer	OPTIONAL,
 	...}
 
diff --git a/asn1/MAP-ShortMessageServiceOperations.asn b/asn1/MAP-ShortMessageServiceOperations.asn
index a6e4d61..059db5c 100644
--- a/asn1/MAP-ShortMessageServiceOperations.asn
+++ b/asn1/MAP-ShortMessageServiceOperations.asn
@@ -24,7 +24,8 @@ EXPORTS
 	alertServiceCentre,
 	informServiceCentreV2,
 	informServiceCentreV3,
-	readyForSM,
+	readyForSMV2,
+	readyForSMV3,
 	mt-ForwardSM-VGCS
 ;
 
@@ -68,8 +69,9 @@ FROM MAP-Errors {
 	AlertServiceCentreArg,
 	InformServiceCentreArgV2,
 	InformServiceCentreArgV3,
-	ReadyForSM-Arg,
-	ReadyForSM-Res,
+	ReadyForSM-ArgV2,
+	ReadyForSM-ArgV3,
+	ReadyForSM-ResV3,
 	MT-ForwardSM-VGCS-Arg,
 	MT-ForwardSM-VGCS-Res
 FROM MAP-SM-DataTypes {
@@ -211,11 +213,20 @@ informServiceCentreV3  OPERATION ::= {				--Timer s
 		InformServiceCentreArgV3
 	CODE	local:63 }
 
-readyForSM  OPERATION ::= {				--Timer m
+readyForSMV2  OPERATION ::= {				--Timer m
 	ARGUMENT
-		ReadyForSM-Arg
+		ReadyForSM-ArgV2
+	ERRORS {
+		dataMissing |
+		unexpectedDataValue |
+		facilityNotSupported |
+		unknownSubscriber}
+	CODE	local:66 }
+readyForSMV3  OPERATION ::= {				--Timer m
+	ARGUMENT
+		ReadyForSM-ArgV3
 	RESULT
-		ReadyForSM-Res
+		ReadyForSM-ResV3
 		-- optional
 	ERRORS {
 		dataMissing |
diff --git a/asn1/TCAPMessages.asn b/asn1/TCAPMessages.asn
index e078c8b..c4da025 100644
--- a/asn1/TCAPMessages.asn
+++ b/asn1/TCAPMessages.asn
@@ -34,7 +34,8 @@ IMPORTS
   alertServiceCentre,
   informServiceCentreV2,
   informServiceCentreV3,
-  readyForSM
+  readyForSMV2,
+  readyForSMV3
 	FROM MAP-ShortMessageServiceOperations {
 	   itu-t identified-organization (4) etsi (0) mobileDomain (0)
 	   gsm-Network (1) modules (3) map-ShortMessageServiceOperations (9)
@@ -65,7 +66,8 @@ MAPOperations-Invokable OPERATION ::=
 	{sendRoutingInfoForSMV2 | sendRoutingInfoForSMV3 | mo-ForwardSM | mt-ForwardSM} 
 MAPOperations-Returnable OPERATION ::= 
 	{reportSM-DeliveryStatusV2 | reportSM-DeliveryStatusV3 |
-	 alertServiceCentre | informServiceCentreV2 | informServiceCentreV3 | readyForSM} 
+	 alertServiceCentre | informServiceCentreV2 | informServiceCentreV3 |
+	 readyForSMV2 | readyForSMV3} 
 
 -- End - Added by Eranga