tracingContext: Introduce a v2 versions for activateTraceMode and deactivateTraceMode

Add a todo in the binding package.. as beginSubscriberActivity
is needed for binding SS between HLR and VLR...

5 files changed, 93 insertions, 29 deletions

diff --git a/asn1/MAP-ApplicationContexts.asn b/asn1/MAP-ApplicationContexts.asn
index 35b6cfe..5e65aaf 100644
--- a/asn1/MAP-ApplicationContexts.asn
+++ b/asn1/MAP-ApplicationContexts.asn
@@ -45,6 +45,7 @@ IMPORTS
    interVlrInfoRetrievalPackage-v2,
    subscriberDataMngtStandAlonePackage-v2,
    subscriberDataMngtStandAlonePackage-v3,
+   tracingStandAlonePackage-v2,
    tracingStandAlonePackage-v3,
    functionalSsPackage-v2,
    functionalSsPackage-v1,
@@ -233,6 +234,12 @@ subscriberDataMngtContext-v3 APPLICATION-CONTEXT ::= {
     subscriberDataMngtStandAlonePackage-v3}
  ID {map-ac subscriberDataMngt(16) version3(3)} }
 
+tracingContext-v2 APPLICATION-CONTEXT ::= {
+    -- Responder is VLR or SGSN if Initiator is HLR
+    INITIATOR CONSUMER OF {
+    tracingStandAlonePackage-v2}
+ ID {map-ac tracing(17) version2(2)} }
+
 tracingContext-v3 APPLICATION-CONTEXT ::= {
     -- Responder is VLR or SGSN if Initiator is HLR
     INITIATOR CONSUMER OF {
diff --git a/asn1/MAP-OM-DataTypes.asn b/asn1/MAP-OM-DataTypes.asn
index 947143c..a28c5ae 100644
--- a/asn1/MAP-OM-DataTypes.asn
+++ b/asn1/MAP-OM-DataTypes.asn
@@ -15,10 +15,12 @@ IMPLICIT TAGS
 BEGIN
 
 EXPORTS
-	ActivateTraceModeArg,
-	ActivateTraceModeRes,
-	DeactivateTraceModeArg,
-	DeactivateTraceModeRes,
+	ActivateTraceModeArgV2,
+	ActivateTraceModeArgV3,
+	ActivateTraceModeResV3,
+	DeactivateTraceModeArgV2,
+	DeactivateTraceModeArgV3,
+	DeactivateTraceModeResV3,
 	TracePropagationList
 ;
 
@@ -37,7 +39,15 @@ FROM MAP-ExtensionDataTypes {
 
 ;
 
-ActivateTraceModeArg ::= SEQUENCE {
+ActivateTraceModeArgV2 ::= SEQUENCE {
+	imsi			[0] IMSI		OPTIONAL,
+	traceReference	[1] TraceReference,
+	traceType		[2] TraceType,
+	omc-Id		[3] AddressString	OPTIONAL,
+	...
+}
+
+ActivateTraceModeArgV3 ::= SEQUENCE {
 	imsi			[0] IMSI		OPTIONAL,
 	traceReference	[1] TraceReference,
 	traceType		[2] TraceType,
@@ -267,13 +277,19 @@ TracePropagationList ::= SEQUENCE {
 	mgw-EventList	[11] MGW-EventList	OPTIONAL,
 	...}
 
-ActivateTraceModeRes ::= SEQUENCE {
+ActivateTraceModeResV3 ::= SEQUENCE {
 	extensionContainer	[0] ExtensionContainer	OPTIONAL,
 	...,
 	traceSupportIndicator	[1]	NULL		OPTIONAL
 	}
 
-DeactivateTraceModeArg ::= SEQUENCE {
+DeactivateTraceModeArgV2 ::= SEQUENCE {
+	imsi			[0] IMSI		OPTIONAL,
+	traceReference	[1] TraceReference,
+	...
+}
+
+DeactivateTraceModeArgV3 ::= SEQUENCE {
 	imsi			[0] IMSI		OPTIONAL,
 	traceReference	[1] TraceReference,
 	extensionContainer	[2] ExtensionContainer	OPTIONAL,
@@ -281,7 +297,7 @@ DeactivateTraceModeArg ::= SEQUENCE {
 	traceReference2	[3] TraceReference2	OPTIONAL
 	}
 
-DeactivateTraceModeRes ::= SEQUENCE {
+DeactivateTraceModeResV3 ::= SEQUENCE {
 	extensionContainer	[0] ExtensionContainer	OPTIONAL,
 	...}
 
diff --git a/asn1/MAP-OperationAndMaintenanceOperations.asn b/asn1/MAP-OperationAndMaintenanceOperations.asn
index 8fc44dd..05a0ce6 100644
--- a/asn1/MAP-OperationAndMaintenanceOperations.asn
+++ b/asn1/MAP-OperationAndMaintenanceOperations.asn
@@ -13,8 +13,10 @@ DEFINITIONS
 BEGIN
 
 EXPORTS
-	activateTraceMode,
-	deactivateTraceMode,
+	activateTraceModeV2,
+	activateTraceModeV3,
+	deactivateTraceModeV2,
+	deactivateTraceModeV3,
 	sendIMSI
 ;
 
@@ -35,10 +37,12 @@ FROM MAP-Errors {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-Errors (10) version12 (12)}
 
-	ActivateTraceModeArg,
-	ActivateTraceModeRes,
-	DeactivateTraceModeArg,
-	DeactivateTraceModeRes
+	ActivateTraceModeArgV2,
+	ActivateTraceModeArgV3,
+	ActivateTraceModeResV3,
+	DeactivateTraceModeArgV2,
+	DeactivateTraceModeArgV3,
+	DeactivateTraceModeResV3
 FROM MAP-OM-DataTypes {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
    gsm-Network (1) modules (3) map-OM-DataTypes (12) version12 (12)}
@@ -51,11 +55,23 @@ FROM MAP-CommonDataTypes {
 ;
 
 
-activateTraceMode  OPERATION ::= {				--Timer m
+activateTraceModeV2  OPERATION ::= {				--Timer m
 	ARGUMENT
-		ActivateTraceModeArg
+		ActivateTraceModeArgV2
+	ERRORS {
+		systemFailure |
+		dataMissing |
+		unexpectedDataValue |
+		facilityNotSupported |
+		unidentifiedSubscriber |
+		tracingBufferFull}
+	CODE	local:50 }
+
+activateTraceModeV3  OPERATION ::= {				--Timer m
+	ARGUMENT
+		ActivateTraceModeArgV3
 	RESULT
-		ActivateTraceModeRes
+		ActivateTraceModeResV3
 		-- optional
 	ERRORS {
 		systemFailure |
@@ -66,11 +82,22 @@ activateTraceMode  OPERATION ::= {				--Timer m
 		tracingBufferFull}
 	CODE	local:50 }
 
-deactivateTraceMode  OPERATION ::= {				--Timer m
+deactivateTraceModeV2  OPERATION ::= {				--Timer m
+	ARGUMENT
+		DeactivateTraceModeArgV2
+	ERRORS {
+		systemFailure |
+		dataMissing |
+		unexpectedDataValue |
+		facilityNotSupported |
+		unidentifiedSubscriber}
+	CODE	local:51 }
+
+deactivateTraceModeV3  OPERATION ::= {				--Timer m
 	ARGUMENT
-		DeactivateTraceModeArg
+		DeactivateTraceModeArgV3
 	RESULT
-		DeactivateTraceModeRes
+		DeactivateTraceModeResV3
 		-- optional
 	ERRORS {
 		systemFailure |
diff --git a/asn1/MAP-OperationPackages.asn b/asn1/MAP-OperationPackages.asn
index f276333..0ac0be3 100644
--- a/asn1/MAP-OperationPackages.asn
+++ b/asn1/MAP-OperationPackages.asn
@@ -66,8 +66,10 @@ FROM MAP-MobileServiceOperations {
    gsm-Network (1) modules (3) map-MobileServiceOperations (5)
    version12 (12)}
 
-	activateTraceMode,
-	deactivateTraceMode,
+	activateTraceModeV2,
+	activateTraceModeV3,
+	deactivateTraceModeV2,
+	deactivateTraceModeV3,
 	sendIMSI
 FROM MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -324,11 +326,17 @@ resetPackage-v3  OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES {
 		reset} }
 
+tracingStandAlonePackage-v2  OPERATION-PACKAGE ::= {
+	-- Supplier is VLR or SGSN if Consumer is HLR
+	CONSUMER INVOKES {
+		activateTraceModeV2 |
+		deactivateTraceModeV2} }
+
 tracingStandAlonePackage-v3  OPERATION-PACKAGE ::= {
 	-- Supplier is VLR or SGSN if Consumer is HLR
 	CONSUMER INVOKES {
-		activateTraceMode |
-		deactivateTraceMode} }
+		activateTraceModeV3 |
+		deactivateTraceModeV3} }
 
 functionalSsPackage-v2  OPERATION-PACKAGE ::= {
 	-- Supplier is HLR if Consumer is VLR
@@ -357,14 +365,15 @@ functionalSsPackage-v1  OPERATION-PACKAGE ::= {
 tracingPackage-v3  OPERATION-PACKAGE ::= {
 	-- Supplier is VLR or SGSN if Consumer is HLR
 	CONSUMER INVOKES {
-		activateTraceMode} }
+		activateTraceModeV3} }
 
 bindingPackage-v1  OPERATION-PACKAGE ::= {
 	-- Supplier is HLR if Consumer is VLR
 	-- Supplier is gsmSCF if Consumer is HLR
 	CONSUMER INVOKES {
+-- TODO: XXX: only beginSubscriberActivity is in v4.19.1
 --		beginSubscriberActivity} }
-		activateTraceMode} }
+		activateTraceModeV3} }
 
 unstructuredSsPackage-v2  OPERATION-PACKAGE ::= {
 	-- Supplier is HLR if Consumer is VLR
diff --git a/asn1/MAP-Protocol.asn b/asn1/MAP-Protocol.asn
index 9ab033f..159700a 100644
--- a/asn1/MAP-Protocol.asn
+++ b/asn1/MAP-Protocol.asn
@@ -61,8 +61,10 @@ FROM MAP-MobileServiceOperations {
    gsm-Network (1) modules (3) map-MobileServiceOperations (5)
    version12 (12)}
 
-	activateTraceMode,
-	deactivateTraceMode,
+	activateTraceModeV2,
+	activateTraceModeV3,
+	deactivateTraceModeV2,
+	deactivateTraceModeV3,
 	sendIMSI
 FROM MAP-OperationAndMaintenanceOperations {
    itu-t identified-organization (4) etsi (0) mobileDomain (0)
@@ -154,7 +156,10 @@ deleteSubscriberDataV2 | deleteSubscriberDataV3 |
 reset | forwardCheckSS-Indication | restoreData | provideSubscriberInfo |
 anyTimeInterrogation | anyTimeSubscriptionInterrogation | anyTimeModification |
 sendRoutingInfoForGprs | failureReport |noteMsPresentForGprs | noteMM-Event |
-noteSubscriberDataModified | activateTraceMode | deactivateTraceMode | sendIMSI |
+noteSubscriberDataModified |
+activateTraceModeV2 | deactivateTraceModeV2 |
+activateTraceModeV3 | deactivateTraceModeV3 |
+sendIMSI |
 sendRoutingInfoV2 |sendRoutingInfoV3 |
 provideRoamingNumberV2 | provideRoamingNumberV3 |
 resumeCallHandling | setReportingState | statusReport | remoteUserFree | ist-Alert |