aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x411
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2006-12-14 00:16:06 +0000
committerStephen Fisher <steve@stephen-fisher.com>2006-12-14 00:16:06 +0000
commitc97caf2a94720d932d80f61fc93c24f13c3dcbd3 (patch)
tree8790db85295242281f8e474ba29864f3faee58f9 /asn1/x411
parent8b8b648ad660ac651ff88718e4ea8b70ab28b7bd (diff)
From Stig Bjorlykke:
I have added a new dissector for DMP (STANAG 4406 Direct Message Profile) as defined in STANAG 4406 Annex E. The DMP protocol has no assigned UDP port number yet, so the default value in this dissector is 0 (I suppose this is som sort of "disabled"?) until we get this registered. The dissector has been tested on OSX Intel/PowerPC and Solaris SPARC. Changes in this patch: * Added DMP dissector * Added a new CRC table and functions in crc16.c * Made NonDeliveryReasonCode and NonDeliveryDiagnosticCode available from X.411 * Made NonReceiptReasonField and DiscardReasonField available from X.420 svn path=/trunk/; revision=20133
Diffstat (limited to 'asn1/x411')
-rw-r--r--asn1/x411/x411-exp.cnf4
-rw-r--r--asn1/x411/x411.cnf2
2 files changed, 6 insertions, 0 deletions
diff --git a/asn1/x411/x411-exp.cnf b/asn1/x411/x411-exp.cnf
index 347771586f..abf45fd5c5 100644
--- a/asn1/x411/x411-exp.cnf
+++ b/asn1/x411/x411-exp.cnf
@@ -16,6 +16,8 @@ ExtendedContentType BER_CLASS_UNI BER_UNI_TAG_OID
ContentLength BER_CLASS_UNI BER_UNI_TAG_INTEGER
MessageDeliveryIdentifier BER_CLASS_APP 4
MessageDeliveryTime BER_CLASS_UNI BER_UNI_TAG_UTCTime
+NonDeliveryReasonCode BER_CLASS_UNI BER_UNI_TAG_INTEGER
+NonDeliveryDiagnosticCode BER_CLASS_UNI BER_UNI_TAG_INTEGER
SupplementaryInformation BER_CLASS_UNI BER_UNI_TAG_PrintableString
RequestedDeliveryMethod BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
OriginatingMTACertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@@ -39,6 +41,8 @@ ExtendedContentType TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL
ContentLength TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
MessageDeliveryIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
MessageDeliveryTime TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+NonDeliveryReasonCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_NonDeliveryReasonCode_vals) BITMASK = 0
+NonDeliveryDiagnosticCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_NonDeliveryDiagnosticCode_vals) BITMASK = 0
SupplementaryInformation TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
RequestedDeliveryMethod TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
OriginatingMTACertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index fc69205d5d..b5b50338d0 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -29,6 +29,8 @@ SecurityLabel
SupplementaryInformation
TeletexNonBasicParameters
UniversalOrBMPString
+NonDeliveryReasonCode
+NonDeliveryDiagnosticCode
#.TYPE_RENAME
MTABindArgument/authenticated AuthenticatedArgument