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/ftam | |
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/ftam')
-rw-r--r-- | asn1/ftam/ftam.cnf | 9 | ||||
-rw-r--r-- | asn1/ftam/packet-ftam-template.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index bffe6f327a..d4f6af9448 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -9,6 +9,15 @@ ACSE-1 acse #.INCLUDE ../acse/acse-exp.cnf #.EXPORTS +Attribute-Extensions +Concurrency-Access +Date-and-Time-Attribute +Legal-Qualification-Attribute +Object-Availability-Attribute +Object-Size-Attribute +Pathname +Permitted-Actions-Attribute +Private-Use-Attribute #.PDU diff --git a/asn1/ftam/packet-ftam-template.h b/asn1/ftam/packet-ftam-template.h index 69a0ebd74d..1ee4af8288 100644 --- a/asn1/ftam/packet-ftam-template.h +++ b/asn1/ftam/packet-ftam-template.h @@ -31,6 +31,6 @@ #ifndef PACKET_FTAM_H #define PACKET_FTAM_H -/*#include "packet-ftam-exp.h"*/ +#include "packet-ftam-exp.h" #endif /* PACKET_FTAM_H */ |