From Graeme Lunt:

The ftbp.patch file includes:
a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings.
b) New EXPORTs for the FTAM dissector for use in FTBP.
c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do.

* Better ROS handling and registration
* Simplified RTSE registration
* X411 column information, extension naming and use of new RTSE/ROS registration
* X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch).
* Better highlighting of S4406 protocol.


svn path=/trunk/; revision=16296

1 files changed, 7 insertions, 3 deletions

diff --git a/asn1/ros/ros.asn b/asn1/ros/ros.asn
index d76707295e..5b7f20f789 100644
--- a/asn1/ros/ros.asn
+++ b/asn1/ros/ros.asn
@@ -49,13 +49,15 @@ Invoke --{InvokeId:InvokeIdSet, OPERATION:Operations}-- ::= SEQUENCE {
 --   RejectProblem:invoke-unrecognizedLinkedId)
 --  (CONSTRAINED BY { - - which has one or more linked operations- -} !
 --   RejectProblem:invoke-linkedResponseUnexpected)-- OPTIONAL,
-  opcode INTEGER
+  opcode OperationCode
 --    OPERATION.&operationCode
 --      ({Operations} !RejectProblem:invoke-unrecognizedOperation)--,
   argument
 --    OPERATION.&ArgumentType
 --      ({Operations}{@opcode} !RejectProblem:invoke-mistypedArgument) -- ANY OPTIONAL
 }
+OperationCode ::= INTEGER
+
 --(CONSTRAINED BY { - - must conform to the above definition - -} !
 -- RejectProblem:general-mistypedPDU)
 --(WITH COMPONENTS {
@@ -78,7 +80,7 @@ ReturnResult --{OPERATION:Operations}-- ::= SEQUENCE {
 --      (CONSTRAINED BY { - - which returns a result - -} !
 --       RejectProblem:returnResult-resultResponseUnexpected)--,
   result
-    SEQUENCE {opcode INTEGER
+    SEQUENCE {opcode OperationCode
 --                OPERATION.&operationCode({Operations})
 --                  (CONSTRAINED BY { - - identified by invokeId - -} !
 --                   RejectProblem:returnResult-unrecognizedInvocation)--,
@@ -97,7 +99,7 @@ ReturnError --{ERROR:Errors}-- ::= SEQUENCE {
 --       RejectProblem:returnError-unrecognizedInvocation)
 --      (CONSTRAINED BY { - - which returns an error - -} !
 --       RejectProblem:returnError-errorResponseUnexpected) --,
-  errcode INTEGER
+  errcode ErrorCode
 --    ERROR.&errorCode({Errors} !RejectProblem:returnError-unrecognizedError)
 --      (CONSTRAINED BY { - - must be in the &Errors field of the associated operation - -
 --         } !RejectProblem:returnError-unexpectedError)--,
@@ -109,6 +111,8 @@ ReturnError --{ERROR:Errors}-- ::= SEQUENCE {
 --(CONSTRAINED BY { - - must conform to the above definition - -} !
 -- RejectProblem:general-mistypedPDU)
 
+ErrorCode ::= INTEGER
+
 Reject ::= SEQUENCE {
   invokeId  InvokeId,
   problem