diff options
author | Stephen Fisher <steve@stephen-fisher.com> | 2006-12-14 00:16:06 +0000 |
---|---|---|
committer | Stephen Fisher <steve@stephen-fisher.com> | 2006-12-14 00:16:06 +0000 |
commit | c97caf2a94720d932d80f61fc93c24f13c3dcbd3 (patch) | |
tree | 8790db85295242281f8e474ba29864f3faee58f9 /asn1 | |
parent | 8b8b648ad660ac651ff88718e4ea8b70ab28b7bd (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')
-rw-r--r-- | asn1/x411/x411-exp.cnf | 4 | ||||
-rw-r--r-- | asn1/x411/x411.cnf | 2 | ||||
-rw-r--r-- | asn1/x420/x420-exp.cnf | 4 | ||||
-rw-r--r-- | asn1/x420/x420.cnf | 2 |
4 files changed, 12 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 diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf index 1ef3330743..551c7d9be9 100644 --- a/asn1/x420/x420-exp.cnf +++ b/asn1/x420/x420-exp.cnf @@ -14,6 +14,8 @@ ORDescriptor BER_CLASS_UNI BER_UNI_TAG_SET ExtensionsField BER_CLASS_UNI BER_UNI_TAG_SET MessageParameters BER_CLASS_UNI BER_UNI_TAG_SET IPN BER_CLASS_UNI BER_UNI_TAG_SET +NonReceiptReasonField BER_CLASS_UNI BER_UNI_TAG_ENUMERATED +DiscardReasonField BER_CLASS_UNI BER_UNI_TAG_ENUMERATED #.END #.TYPE_ATTR @@ -23,5 +25,7 @@ ORDescriptor TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL ExtensionsField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 MessageParameters TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 IPN TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +NonReceiptReasonField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x420_NonReceiptReasonField_vals) BITMASK = 0 +DiscardReasonField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x420_DiscardReasonField_vals) BITMASK = 0 #.END diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 213eb75d4e..fd83b59f4d 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -16,6 +16,8 @@ ExtensionsField IPM IPN MessageParameters +NonReceiptReasonField +DiscardReasonField #.FIELD_RENAME |