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, 27 insertions, 10 deletions

diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index 0f3c24de48..2260d5fd73 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -118,6 +118,12 @@ MessageTransferEnvelope/per-recipient-fields/_item	per-recipient-message-fields-
 MessageTransferEnvelope/per-recipient-fields		per-recipient-message-fields
 ReportTransferContent/per-recipient-fields		per-recipient-report-fields
 
+#.PDU
+MTABindArgument
+MTABindResult
+MTABindError
+MTS-APDU
+
 #.REGISTER
 RecipientReassignmentProhibited B "x411.extension.1" "recipient-reassignment-prohibited"
 MTSOriginatorRequestedAlternateRecipient B "x411.extension.2" "originator-requested-alternate-recipient"
@@ -253,21 +259,19 @@ UniversalOrganizationalUnitNames B "x411.extension-attribute.27" "universal-orga
                                          NULL);
 
 
-#.FN_BODY INTEGER
-
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                  &extension_id);
+#.FN_PARS INTEGER
+	VAL_PTR = &extension_id
 
-#.FN_BODY ExtendedContentType
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
-                                         hf_index, object_identifier_id);
+#.FN_PARS ExtendedContentType
+	VAL_PTR = object_identifier_id
 
+#.FN_PARS BuiltInContentType
+	VAL_PTR = &ict
 
 #.FN_BODY BuiltInContentType
   guint32	ict = -1;	
 
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
-                                  &ict);
+  %(DEFAULT_BODY)s
 
   /* convert integer content type to oid for dispatch when the content is found */
   switch(ict) {
@@ -288,6 +292,19 @@ UniversalOrganizationalUnitNames B "x411.extension-attribute.27" "universal-orga
   offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_index, &next_tvb);
 
   if (next_tvb)
-    (void) call_ber_oid_callback(object_identifier_id, next_tvb, 0, pinfo, tree);
+    (void) call_ber_oid_callback(object_identifier_id, next_tvb, 0, pinfo, top_tree ? top_tree : tree);
+
+#.FN_PARS MTAName
+	VAL_PTR = &mtaname
+
+#.FN_BODY MTAName
+	tvbuff_t	*mtaname;
+
+	%(DEFAULT_BODY)s
+
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+		col_append_fstr(pinfo->cinfo, COL_INFO, " %%s", tvb_get_string(mtaname, 0, tvb_length(mtaname)));
+	}
 
 #.END
+