diff options
| -rw-r--r-- | epan/dissectors/packet-image-gif.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-image-png.c | 1 | ||||
| -rw-r--r-- | wiretap/mime_file.c | 10 |
3 files changed, 10 insertions, 2 deletions
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c index 23e7de8ea8..9151cdd7e2 100644 --- a/epan/dissectors/packet-image-gif.c +++ b/epan/dissectors/packet-image-gif.c @@ -688,4 +688,5 @@ proto_reg_handoff_gif(void) /* Register the GIF media type */ dissector_add_string("media_type", "image/gif", gif_handle); heur_dissector_add("http", dissect_gif_heur, proto_gif); + heur_dissector_add("wtap_file", dissect_gif_heur, proto_gif); } diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index d9978d389c..fca50301d1 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -435,4 +435,5 @@ proto_reg_handoff_png(void) dissector_handle_t png_handle = new_create_dissector_handle(dissect_png, proto_png); dissector_add_string("media_type", "image/png", png_handle); heur_dissector_add("http", dissect_png_heur, proto_png); + heur_dissector_add("wtap_file", dissect_png_heur, proto_png); } 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])) |