summaryrefslogtreecommitdiff
path: root/wiretap/mime_file.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-01-30 19:26:05 +0000
committerMichael Mann <mmann78@netscape.net>2013-01-30 19:26:05 +0000
commitd6901da1d1b037c2969595acc952695ffd8ff9d8 (patch)
treed8263b949648830f01f98668a8b15d72cf68ab97 /wiretap/mime_file.c
parent942ac68bdc3eeca3a95c5abeabc9a86de8c19dbf (diff)
downloadwireshark-d6901da1d1b037c2969595acc952695ffd8ff9d8.tar.gz
Wiretap: Add support for files contain GIF, PNG images
From Michal Labedzki, bug 8278 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8278) svn path=/trunk/; revision=47368
Diffstat (limited to 'wiretap/mime_file.c')
-rw-r--r--wiretap/mime_file.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index 61341ee662..5d9000f5ca 100644
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -72,11 +72,17 @@ static const guint8 jpeg_jfif_magic[] = { 0xFF, 0xD8, /* SOF */
};
/* <?xml */
-static const guint8 xml_magic[] = { '<', '?', 'x', 'm', 'l' };
+static const guint8 xml_magic[] = { '<', '?', 'x', 'm', 'l' };
+static const guint8 png_magic[] = { 137, 80, 78, 71, 13, 10, 26, 10 };
+static const guint8 gif87a_magic[] = { 'G', 'I', 'F', '8', '7', 'a'};
+static const guint8 gif89a_magic[] = { 'G', 'I', 'F', '8', '9', 'a'};
static const mime_files_t magic_files[] = {
{ jpeg_jfif_magic, sizeof(jpeg_jfif_magic) },
- { xml_magic, sizeof(xml_magic) }
+ { xml_magic, sizeof(xml_magic) },
+ { png_magic, sizeof(png_magic) },
+ { gif87a_magic, sizeof(gif87a_magic) },
+ { gif89a_magic, sizeof(gif89a_magic) }
};
#define N_MAGIC_TYPES (sizeof(magic_files) / sizeof(magic_files[0]))