diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-03 17:48:40 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-05 21:57:31 +0000 |
| commit | 0d368850aebe054b66959975df4ddbbad58a37a9 (patch) | |
| tree | 0b339f77126ca9a994668ab40087734050edc144 /epan/dissectors | |
| parent | 5956556aceb1f59387a081a6e8898a7e40730936 (diff) | |
tnef: fix conflicting entry in its value_string
Field 'Type' (tnef.property.tag.type) has a conflicting entry in its value_string: 4126 is at indices 24 (PT_MV_STRING8) and 25 (PT_MV_TSTRING))
Change-Id: I306ba69b954f22781bbafe4400993d73c9be5811
Reviewed-on: https://code.wireshark.org/review/21511
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-nspi.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc-nspi.h | 1 | ||||
| -rw-r--r-- | epan/dissectors/pidl/nspi/nspi.idl | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c index b40048e9a2..0211066b0b 100644 --- a/epan/dissectors/packet-dcerpc-nspi.c +++ b/epan/dissectors/packet-dcerpc-nspi.c @@ -3727,7 +3727,6 @@ const value_string nspi_property_types_vals[] = { { PT_MV_APPTIME, "PT_MV_APPTIME" }, { PT_MV_I8, "PT_MV_I8" }, { PT_MV_STRING8, "PT_MV_STRING8" }, - { PT_MV_TSTRING, "PT_MV_TSTRING" }, { PT_MV_UNICODE, "PT_MV_UNICODE" }, { PT_MV_SYSTIME, "PT_MV_SYSTIME" }, { PT_MV_CLSID, "PT_MV_CLSID" }, @@ -8275,7 +8274,6 @@ nspi_dissect_struct_NAME_STRING(tvbuff_t *tvb _U_, int offset _U_, packet_info * /* IDL: PT_MV_APPTIME=0x1007, */ /* IDL: PT_MV_I8=0x1014, */ /* IDL: PT_MV_STRING8=0x101e, */ -/* IDL: PT_MV_TSTRING=0x101e, */ /* IDL: PT_MV_UNICODE=0x101f, */ /* IDL: PT_MV_SYSTIME=0x1040, */ /* IDL: PT_MV_CLSID=0x1048, */ diff --git a/epan/dissectors/packet-dcerpc-nspi.h b/epan/dissectors/packet-dcerpc-nspi.h index 913bd1d4e5..a7f0525cce 100644 --- a/epan/dissectors/packet-dcerpc-nspi.h +++ b/epan/dissectors/packet-dcerpc-nspi.h @@ -3529,7 +3529,6 @@ int nspi_dissect_struct_NAME_STRING(tvbuff_t *tvb _U_, int offset _U_, packet_in #define PT_MV_APPTIME (0x1007) #define PT_MV_I8 (0x1014) #define PT_MV_STRING8 (0x101e) -#define PT_MV_TSTRING (0x101e) #define PT_MV_UNICODE (0x101f) #define PT_MV_SYSTIME (0x1040) #define PT_MV_CLSID (0x1048) diff --git a/epan/dissectors/pidl/nspi/nspi.idl b/epan/dissectors/pidl/nspi/nspi.idl index be0cc36fce..5c89377077 100644 --- a/epan/dissectors/pidl/nspi/nspi.idl +++ b/epan/dissectors/pidl/nspi/nspi.idl @@ -259,7 +259,7 @@ PT_MV_APPTIME = 0x1007, PT_MV_I8 = 0x1014, PT_MV_STRING8 = 0x101e, - PT_MV_TSTRING = 0x101e, +// PT_MV_TSTRING = 0x101e, PT_MV_UNICODE = 0x101f, PT_MV_SYSTIME = 0x1040, PT_MV_CLSID = 0x1048, |