diff options
author | Anders Broman <anders.broman@ericsson.com> | 2007-04-20 13:54:56 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2007-04-20 13:54:56 +0000 |
commit | 5954b97ac4627db4874a65c1ada2c5dbbf746b37 (patch) | |
tree | 4555877791f37b04907481e385e1bcb85a6b9f76 | |
parent | 31937c3b3087771b57604f269b31a60778245935 (diff) |
Add EXTERNAL to the value string and add comments about UNIVERSAL tags.
svn path=/trunk/; revision=21479
-rw-r--r-- | epan/dissectors/packet-ber.c | 51 | ||||
-rw-r--r-- | epan/dissectors/packet-ber.h | 11 |
2 files changed, 39 insertions, 23 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 6aff5af60c..4d935239f0 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -136,35 +136,40 @@ static const true_false_string ber_pc_codes = { }; static const value_string ber_uni_tag_codes[] = { - { BER_UNI_TAG_EOC , "'end-of-content'" }, - { BER_UNI_TAG_BOOLEAN , "BOOLEAN" }, - { BER_UNI_TAG_INTEGER , "INTEGER" }, - { BER_UNI_TAG_BITSTRING , "BIT STRING" }, - { BER_UNI_TAG_OCTETSTRING , "OCTET STRING" }, - { BER_UNI_TAG_NULL , "NULL" }, - { BER_UNI_TAG_OID , "OBJECT IDENTIFIER" }, + { BER_UNI_TAG_EOC , "'end-of-content'" }, + { BER_UNI_TAG_BOOLEAN , "BOOLEAN" }, + { BER_UNI_TAG_INTEGER , "INTEGER" }, + { BER_UNI_TAG_BITSTRING , "BIT STRING" }, + { BER_UNI_TAG_OCTETSTRING , "OCTET STRING" }, + { BER_UNI_TAG_NULL , "NULL" }, + { BER_UNI_TAG_OID , "OBJECT IDENTIFIER" }, { BER_UNI_TAG_ObjectDescriptor , "ObjectDescriptor" }, - { BER_UNI_TAG_REAL , "REAL" }, - { BER_UNI_TAG_ENUMERATED , "ENUMERATED" }, - { BER_UNI_TAG_EMBEDDED_PDV , "EMBEDDED PDV" }, - { BER_UNI_TAG_UTF8String , "UTF8String" }, - { BER_UNI_TAG_RELATIVE_OID , "RELATIVE-OID" }, - { BER_UNI_TAG_SEQUENCE , "SEQUENCE" }, - { BER_UNI_TAG_SET , "SET" }, - { BER_UNI_TAG_NumericString , "NumericString" }, + { BER_UNI_TAG_EXTERNAL , "EXTERNAL" }, + { BER_UNI_TAG_REAL , "REAL" }, + { BER_UNI_TAG_ENUMERATED , "ENUMERATED" }, + { BER_UNI_TAG_EMBEDDED_PDV , "EMBEDDED PDV" }, + { BER_UNI_TAG_UTF8String , "UTF8String" }, + { BER_UNI_TAG_RELATIVE_OID , "RELATIVE-OID" }, + /* UNIVERSAL 14-15 + * Reserved for future editions of this + * Recommendation | International Standard + */ + { BER_UNI_TAG_SEQUENCE , "SEQUENCE" }, + { BER_UNI_TAG_SET , "SET" }, + { BER_UNI_TAG_NumericString , "NumericString" }, { BER_UNI_TAG_PrintableString , "PrintableString" }, - { BER_UNI_TAG_TeletexString , "TeletexString, T61String" }, + { BER_UNI_TAG_TeletexString , "TeletexString, T61String" }, { BER_UNI_TAG_VideotexString , "VideotexString" }, - { BER_UNI_TAG_IA5String , "IA5String" }, - { BER_UNI_TAG_UTCTime , "UTCTime" }, + { BER_UNI_TAG_IA5String , "IA5String" }, + { BER_UNI_TAG_UTCTime , "UTCTime" }, { BER_UNI_TAG_GeneralizedTime , "GeneralizedTime" }, - { BER_UNI_TAG_GraphicString , "GraphicString" }, - { BER_UNI_TAG_VisibleString , "VisibleString, ISO64String" }, - { BER_UNI_TAG_GeneralString , "GeneralString" }, + { BER_UNI_TAG_GraphicString , "GraphicString" }, + { BER_UNI_TAG_VisibleString , "VisibleString, ISO64String" }, + { BER_UNI_TAG_GeneralString , "GeneralString" }, { BER_UNI_TAG_UniversalString , "UniversalString" }, { BER_UNI_TAG_CHARACTERSTRING , "CHARACTER STRING" }, - { BER_UNI_TAG_BMPString , "BMPString" }, - { 31 , "Continued" }, + { BER_UNI_TAG_BMPString , "BMPString" }, + { 31 , "Continued" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index c72dbc5074..359feb3bd9 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -55,26 +55,37 @@ typedef int (*ber_type_fn)(gboolean, tvbuff_t*, int, packet_info*, proto_tree*, #define BER_UNI_TAG_NULL 5 #define BER_UNI_TAG_OID 6 /* OBJECT IDENTIFIER */ #define BER_UNI_TAG_ObjectDescriptor 7 +#define BER_UNI_TAG_EXTERNAL 8 #define BER_UNI_TAG_REAL 9 #define BER_UNI_TAG_ENUMERATED 10 #define BER_UNI_TAG_EMBEDDED_PDV 11 #define BER_UNI_TAG_UTF8String 12 #define BER_UNI_TAG_RELATIVE_OID 13 +/* UNIVERSAL 14-15 + * Reserved for future editions of this + * Recommendation | International Standard + */ #define BER_UNI_TAG_SEQUENCE 16 /* SEQUENCE, SEQUENCE OF */ #define BER_UNI_TAG_SET 17 /* SET, SET OF */ +/* UNIVERSAL 18-22 Character string types */ #define BER_UNI_TAG_NumericString 18 #define BER_UNI_TAG_PrintableString 19 #define BER_UNI_TAG_TeletexString 20 /* TeletextString, T61String */ #define BER_UNI_TAG_VideotexString 21 #define BER_UNI_TAG_IA5String 22 +/* UNIVERSAL 23-24 Time types */ #define BER_UNI_TAG_UTCTime 23 #define BER_UNI_TAG_GeneralizedTime 24 +/* UNIVERSAL 25-30 Character string types */ #define BER_UNI_TAG_GraphicString 25 #define BER_UNI_TAG_VisibleString 26 /* VisibleString, ISO64String */ #define BER_UNI_TAG_GeneralString 27 #define BER_UNI_TAG_UniversalString 28 #define BER_UNI_TAG_CHARACTERSTRING 29 #define BER_UNI_TAG_BMPString 30 +/* UNIVERSAL 31- ... + * Reserved for addenda to this Recommendation | International Standard + */ /* this function dissects the identifier octer of the BER TLV. |