aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x411
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-28 14:24:32 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-28 14:24:32 +0000
commit1d8014fab44f704e9de9ce5686a5a6849b19f572 (patch)
tree51256dc28dc7fc4b953c1cc2ce5ffa79b267cc4a /asn1/x411
parent1a4a7a718d5cf1778cc15b609b3160187b3e5fba (diff)
Removal of various warnings, mainly by not emitting functions for ASN.1 types that are only used for COMPONENTS OF.
svn path=/trunk/; revision=33350
Diffstat (limited to 'asn1/x411')
-rw-r--r--asn1/x411/packet-x411-template.h3
-rw-r--r--asn1/x411/x411.cnf35
2 files changed, 37 insertions, 1 deletions
diff --git a/asn1/x411/packet-x411-template.h b/asn1/x411/packet-x411-template.h
index eba458279d..01eb470f27 100644
--- a/asn1/x411/packet-x411-template.h
+++ b/asn1/x411/packet-x411-template.h
@@ -32,4 +32,7 @@ char* x411_get_last_oraddress(void);
void dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
#include "packet-x411-exp.h"
+void proto_reg_handoff_x411(void);
+void proto_register_x411(void);
+
#endif /* PACKET_X411_H */
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index c69b7e21ef..55079ac56b 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -1,3 +1,7 @@
+# x411.cnf
+# X.411 (MTA Access and Transfer) conformance file
+# $Id$
+
#.TYPE_ATTR
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_CountryName_U_vals) BITMASK = 0
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
@@ -12,12 +16,41 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.OMIT_ASSIGNMENT
# These gives unused code warnings
MTAOriginatorRequestedAlternateRecipient
+
+#The following are only referenced through the SIGNATURE MACRO
+#and so have no representation on the wire.
ProofOfDeliveryAlgorithmIdentifier
-DeliveryControls
ContentIntegrityAlgorithmIdentifier
MessageOriginAuthenticationAlgorithmIdentifier
ProbeOriginAuthenticationAlgorithmIdentifier
ReportOriginAuthenticationAlgorithmIdentifier
+ProofOfSubmissionAlgorithmIdentifier
+
+BilateralDomain
+DeliveryControls
+RTSE-apdus
+MTSInvokeIds
+ID
+RTTPapdu
+RTTRapdu
+RTABapdu
+AbortReason
+#.END
+
+#.NO_EMIT
+# These fields are only used through COMPONENTS OF,
+# and consequently generate unused code warnings
+PerMessageTransferFields
+PerProbeTransferFields
+PerReportTransferFields
+PerMessageSubmissionFields
+PerProbeSubmissionFields
+PerReportDeliveryFields
+PerRecipientReportFields
+#PerRecipientReportFields/report-type
+InternalAdditionalActions
+AdditionalActions
+NonBasicParameters
#.END
#.EXPORTS