diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-10-24 21:42:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-10-24 21:42:19 +0000 |
| commit | 314c36da9ab818ee9d47759cda10cb9466afbce7 (patch) | |
| tree | 63b6cd3c22e99a490f472c65b08acdb48952b4c0 /asn1/ros/ros.cnf | |
| parent | 149b419740ffdad03b11037819d6def9b9492651 (diff) | |
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
Diffstat (limited to 'asn1/ros/ros.cnf')
| -rw-r--r-- | asn1/ros/ros.cnf | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/asn1/ros/ros.cnf b/asn1/ros/ros.cnf index 3c74d6b37c..511f97c9d2 100644 --- a/asn1/ros/ros.cnf +++ b/asn1/ros/ros.cnf @@ -2,7 +2,21 @@ InvokeId Code -#.FN_BODY opcode +#.TYPE_RENAME +ReturnResult/result/result OperationResult + +#.FIELD_RENAME +Reject/problem/invoke invokeProblem +ReturnResult/result/result operationResult +Reject/problem/returnError rejectError +Reject/problem/returnResult rejectResult + +#.FN_BODY OperationCode + + offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, + &opcode); + +#.FN_BODY ErrorCode offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode); @@ -26,7 +40,7 @@ Code offset = call_ros_oid_callback(oid, tvb, offset, pinfo, top_tree); } -#.FN_BODY T_result1 +#.FN_BODY OperationResult char *oid; /* not sure what the length should be - -1 for now */ proto_tree_add_text(tree, tvb, offset,-1, "return result"); |