Second step in introducing asn context to BER dissectors just like in PER.

svn path=/trunk/; revision=21753

1 files changed, 102 insertions, 39 deletions

diff --git a/asn1/inap/inap.asn b/asn1/inap/inap.asn
index dd92e65338..a44d426854 100644
--- a/asn1/inap/inap.asn
+++ b/asn1/inap/inap.asn
@@ -2,6 +2,108 @@ IN-CS-1-Operations-appendix { ccitt recommendation q 1218 modules(0) cs-1-operat
 --  This module contains additional type definitions for IN CS-1 operations.
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
+
+-- IMPORTED ROS stuff for Wireshark use
+-- ROS def's
+-- Module Remote-Operations-Apdus (H.450.1:02/1998)
+--Remote-Operations-Apdus {itu-t recommendation h 450 1 version1(0)
+--  remote-operations-apdus(11)} DEFINITIONS AUTOMATIC TAGS ::=
+--BEGIN
+
+Component ::=	CHOICE {
+				invoke				[1] IMPLICIT Invoke,
+				returnResultLast	[2] IMPLICIT ReturnResult,
+				returnError			[3] IMPLICIT ReturnError,
+				reject				[4] IMPLICIT Reject,
+-- TCAP adds returnResultNotLast to allow for the segmentation of a result.
+				returnResultNotLast	[7] IMPLICIT ReturnResult
+}
+Invoke ::=		SEQUENCE {
+				invokeID			InvokeIdType,
+				linkedID			[0] IMPLICIT InvokeIdType OPTIONAL,
+				opCode				OPERATION,
+				invokeparameter	 	InvokeParameter OPTIONAL
+}
+
+InvokeParameter ::= ANY
+
+ 
+-- ANY is filled by the single ASN.1 data type following the keyword PARAMETER or the keyword ARGUMENT
+-- in the type definition of a particular operation.
+
+ReturnResult ::=	SEQUENCE {
+				invokeID				InvokeIdType,
+				resultretres			SEQUENCE {
+				opCode					OPERATION,
+				returnparameter				ReturnResultParameter OPTIONAL
+				} OPTIONAL
+			}
+
+ReturnResultParameter ::= ANY
+
+-- ANY is filled by the single ASN.1 data type following the keyword RESULT in the type definition
+-- of a particular operation.
+
+ReturnError ::=	SEQUENCE {
+				invokeID				InvokeIdType,
+				errorCode				ERROR,
+				parameter				ReturnErrorParameter  OPTIONAL }
+
+ReturnErrorParameter ::= ANY
+ 
+-- ANY is filled by the single ASN.1 data type following the keyword PARAMETER in the type definition
+-- of a particular error.
+
+Reject ::=		SEQUENCE {
+				invokeIDRej CHOICE {
+					derivable			InvokeIdType,
+					not-derivable		NULL },
+				problem CHOICE {
+					generalProblem		[0] IMPLICIT GeneralProblem,
+					invokeProblem		[1] IMPLICIT InvokeProblem,
+					returnResultProblem	[2] IMPLICIT ReturnResultProblem,
+					returnErrorProblem	[3] IMPLICIT ReturnErrorProblem } }
+
+InvokeIdType ::=	INTEGER (-128..127)
+
+
+OPERATION	::=	CHOICE {
+							localValue OperationLocalvalue,
+							globalValue OBJECT IDENTIFIER } 
+
+LocalErrorcode ::= INAPLocalErrorcode
+OperationLocalvalue ::= INAPOperationLocalvalue
+INAPLocalErrorcode ::= INTEGER
+INAPOperationLocalvalue ::= INTEGER
+ERROR	::=	CHOICE {
+			localValue LocalErrorcode,
+			globalValue OBJECT IDENTIFIER } 
+
+-- PROBLEMS
+
+GeneralProblem		::=	INTEGER {		unrecognizedComponent (0),
+								mistypedComponent (1),
+								badlyStructuredComponent (2) }
+
+InvokeProblem		::=	INTEGER {		duplicateInvokeID (0),
+								unrecognizedOperation (1),
+								mistypedParameter (2),
+								resourceLimitation (3),
+								initiatingRelease (4),
+								unrecognizedLinkedID (5),
+								linkedResponseUnexpected (6),
+								unexpectedLinkedOperation (7) }
+
+ReturnResultProblem	::=	INTEGER {		unrecognizedInvokeID (0),
+								returnResultUnexpected (1),
+								mistypedParameter (2) }
+
+ReturnErrorProblem	::=	INTEGER {		unrecognizedInvokeID (0),
+								returnErrorUnexpected (1),
+								unrecognizedError (2),
+								unexpectedError (3),
+								mistypedParameter (4) }
+
 --  TYPE DEFINITION FOR ADDITIONAL	IN CS-1	OPERATIONS
 --  SCF-SSF operations
 --  SCF ? SSF
@@ -1469,44 +1571,5 @@ TaskRefused ::=	ENUMERATED {
 --unknownResource ERROR
 -- ::= localValue 18
 
--- additional pdus for reject
-
-InvokeIDType ::= INTEGER
-
-RejectPDU ::= SEQUENCE {
-		rinvokeID CHOICE {
-				invidtype InvokeIDType, 
-				null NULL},
-		rproblem CHOICE {
-				gp [0] IMPLICIT GeneralProblem,
-				ip [1] IMPLICIT InvokeProblem,
-				rrp [2] IMPLICIT ReturnResultProblem,
-				rep [3] IMPLICIT ReturnErrorProblem}}
-
-GeneralProblem ::= INTEGER { -- ROSE-provider detected
-		unrecognisedAPDU(0),
-		mistypedAPDU(1),
-		badlyStructuredAPDU(2)}
-InvokeProblem ::= INTEGER { -- ROSE-user detected
-		duplicateInvocation(0),
-		unrecognisedOperation(1),
-		mistypedArgument(2),
-		resourceLimitation(3),
-		initiatorReleasing(4),
-		unrecognisedLinkedID(5),
-		linkedResponseUnexpected(6),
-		unexpectedChildOperation(7)}
-ReturnResultProblem ::= INTEGER { -- ROSE-user detected
-		unrecognisedInvocation(0),
-		resultResponseUnexpected(1),
-		mistypedResult(2)}
-ReturnErrorProblem ::= INTEGER { -- ROSE-user detected
-		unrecognisedInvocation(0),
-		errorResponseUnexpected(1),
-		unrecognisedError(2),
-		unexpectedError(3),
-		mistypedParameter(4)}
-
-
 
 END
\ No newline at end of file