2014-01-24 14:45:43 +00:00
|
|
|
/* file-png.c
|
2006-08-26 09:16:38 +00:00
|
|
|
*
|
|
|
|
* Routines for PNG (Portable Network Graphics) image file dissection
|
|
|
|
*
|
|
|
|
* $Id$
|
|
|
|
*
|
|
|
|
* Copyright 2006 Ronnie Sahlberg
|
|
|
|
*
|
2007-01-02 14:11:35 +00:00
|
|
|
* Wireshark - Network traffic analyzer
|
2007-01-02 17:19:25 +00:00
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
2006-08-26 09:16:38 +00:00
|
|
|
* Copyright 1998 Gerald Combs
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
2012-06-28 22:56:06 +00:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2006-08-26 09:16:38 +00:00
|
|
|
*/
|
|
|
|
/* See http://www.w3.org/TR/PNG for specification
|
|
|
|
*/
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
#define NEW_PROTO_TREE_API
|
|
|
|
|
2012-09-20 02:03:38 +00:00
|
|
|
#include "config.h"
|
2006-08-26 09:16:38 +00:00
|
|
|
|
|
|
|
#include <glib.h>
|
2013-11-10 15:59:37 +00:00
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
#include <epan/packet.h>
|
2013-11-10 15:59:37 +00:00
|
|
|
#include <epan/exceptions.h>
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-12-15 23:44:12 +00:00
|
|
|
void proto_register_png(void);
|
|
|
|
void proto_reg_handoff_png(void);
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
static header_field_info *hfi_png = NULL;
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
#define PNG_HFI_INIT HFI_INIT(proto_png)
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
static header_field_info hfi_png_signature PNG_HFI_INIT = {
|
|
|
|
"PNG Signature", "png.signature", FT_BYTES, BASE_NONE,
|
|
|
|
NULL, 0, NULL, HFILL };
|
2013-08-05 18:09:43 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
static header_field_info hfi_png_chunk_data PNG_HFI_INIT = {
|
|
|
|
"Data", "png.chunk.data", FT_NONE, BASE_NONE,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_chunk_type PNG_HFI_INIT = {
|
|
|
|
"Chunk", "png.chunk.type", FT_STRING, BASE_NONE,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_chunk_len PNG_HFI_INIT = {
|
|
|
|
"Len", "png.chunk.len", FT_UINT32, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_chunk_crc PNG_HFI_INIT = {
|
|
|
|
"CRC", "png.chunk.crc", FT_UINT32, BASE_HEX,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static const true_false_string png_chunk_anc = {
|
|
|
|
"This is an ANCILLARY chunk",
|
|
|
|
"This is a CRITICAL chunk"
|
|
|
|
};
|
|
|
|
|
|
|
|
static header_field_info hfi_png_chunk_flag_anc PNG_HFI_INIT = {
|
|
|
|
"Ancillary", "png.chunk.flag.ancillary", FT_BOOLEAN, 32,
|
|
|
|
TFS(&png_chunk_anc), 0x20000000, NULL, HFILL };
|
|
|
|
|
|
|
|
static const true_false_string png_chunk_priv = {
|
|
|
|
"This is a PRIVATE chunk",
|
|
|
|
"This is a PUBLIC chunk"
|
|
|
|
};
|
|
|
|
|
|
|
|
static header_field_info hfi_png_chunk_flag_priv PNG_HFI_INIT = {
|
|
|
|
"Private", "png.chunk.flag.private", FT_BOOLEAN, 32,
|
|
|
|
TFS(&png_chunk_priv), 0x00200000, NULL, HFILL };
|
|
|
|
|
|
|
|
static const true_false_string png_chunk_stc = {
|
|
|
|
"This chunk is SAFE TO COPY",
|
|
|
|
"This chunk is NOT safe to copy"
|
|
|
|
};
|
|
|
|
|
|
|
|
static header_field_info hfi_png_chunk_flag_stc PNG_HFI_INIT = {
|
|
|
|
"Safe To Copy", "png.chunk.flag.stc", FT_BOOLEAN, 32,
|
|
|
|
TFS(&png_chunk_stc), 0x00000020, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_ihdr_width PNG_HFI_INIT = {
|
|
|
|
"Width", "png.ihdr.width", FT_UINT32, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_ihdr_height PNG_HFI_INIT = {
|
|
|
|
"Height", "png.ihdr.height", FT_UINT32, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_ihdr_bitdepth PNG_HFI_INIT = {
|
|
|
|
"Bit Depth", "png.ihdr.bitdepth", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
2006-08-26 09:16:38 +00:00
|
|
|
|
|
|
|
static const value_string colour_type_vals[] = {
|
|
|
|
{ 0, "Greyscale"},
|
|
|
|
{ 2, "Truecolour"},
|
|
|
|
{ 3, "Indexed-colour"},
|
|
|
|
{ 4, "Greyscale with alpha"},
|
2006-08-26 11:57:28 +00:00
|
|
|
{ 6, "Truecolour with alpha"},
|
2006-08-26 09:16:38 +00:00
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2013-08-17 08:59:19 +00:00
|
|
|
|
|
|
|
static header_field_info hfi_png_ihdr_colour_type PNG_HFI_INIT = {
|
|
|
|
"Colour Type", "png.ihdr.colour_type", FT_UINT8, BASE_DEC,
|
|
|
|
VALS(colour_type_vals), 0, NULL, HFILL };
|
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
static const value_string compression_method_vals[] = {
|
|
|
|
{ 0, "Deflate"},
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2013-08-17 08:59:19 +00:00
|
|
|
|
|
|
|
static header_field_info hfi_png_ihdr_compression_method PNG_HFI_INIT = {
|
|
|
|
"Compression Method", "png.ihdr.compression_method", FT_UINT8, BASE_DEC,
|
|
|
|
VALS(compression_method_vals), 0, NULL, HFILL };
|
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
static const value_string filter_method_vals[] = {
|
|
|
|
{ 0, "Adaptive"},
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2013-08-17 08:59:19 +00:00
|
|
|
|
|
|
|
static header_field_info hfi_png_ihdr_filter_method PNG_HFI_INIT = {
|
|
|
|
"Filter Method", "png.ihdr.filter_method", FT_UINT8, BASE_DEC,
|
|
|
|
VALS(filter_method_vals), 0, NULL, HFILL };
|
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
static const value_string interlace_method_vals[] = {
|
|
|
|
{ 0, "No interlace"},
|
|
|
|
{ 1, "Adam7"},
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
static header_field_info hfi_png_ihdr_interlace_method PNG_HFI_INIT = {
|
|
|
|
"Interlace Method", "png.ihdr.interlace_method", FT_UINT8, BASE_DEC,
|
|
|
|
VALS(interlace_method_vals), 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_text_keyword PNG_HFI_INIT = {
|
|
|
|
"Keyword", "png.text.keyword", FT_STRING, BASE_NONE,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_text_string PNG_HFI_INIT = {
|
|
|
|
"String", "png.text.string", FT_STRING, BASE_NONE,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_time_year PNG_HFI_INIT = {
|
|
|
|
"Year", "png.time.year", FT_UINT16, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_time_month PNG_HFI_INIT = {
|
|
|
|
"Month", "png.time.month", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_time_day PNG_HFI_INIT = {
|
|
|
|
"Day", "png.time.day", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_time_hour PNG_HFI_INIT = {
|
|
|
|
"Hour", "png.time.hour", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_time_minute PNG_HFI_INIT = {
|
|
|
|
"Minute", "png.time.minute", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_time_second PNG_HFI_INIT = {
|
|
|
|
"Second", "png.time.second", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_phys_horiz PNG_HFI_INIT = {
|
|
|
|
"Horizontal pixels per unit", "png.phys.horiz", FT_UINT32, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_phys_vert PNG_HFI_INIT = {
|
|
|
|
"Vertical pixels per unit", "png.phys.vert", FT_UINT32, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static const value_string phys_unit_vals[] = {
|
|
|
|
{ 0, "Unit is unknown"},
|
|
|
|
{ 1, "Unit is METRE"},
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static header_field_info hfi_png_phys_unit PNG_HFI_INIT = {
|
|
|
|
"Unit", "png.phys.unit", FT_UINT8, BASE_DEC,
|
|
|
|
VALS(phys_unit_vals), 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_bkgd_palette_index PNG_HFI_INIT = {
|
|
|
|
"Palette Index", "png.bkgd.palette_index", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_bkgd_greyscale PNG_HFI_INIT = {
|
|
|
|
"Greyscale", "png.bkgd.greyscale", FT_UINT16, BASE_HEX,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_bkgd_red PNG_HFI_INIT = {
|
|
|
|
"Red", "png.bkgd.red", FT_UINT16, BASE_HEX,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_bkgd_green PNG_HFI_INIT = {
|
|
|
|
"Green", "png.bkgd.green", FT_UINT16, BASE_HEX,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static header_field_info hfi_png_bkgd_blue PNG_HFI_INIT = {
|
|
|
|
"Blue", "png.bkgd.blue", FT_UINT16, BASE_HEX,
|
|
|
|
NULL, 0, NULL, HFILL };
|
|
|
|
|
|
|
|
static gint ett_png = -1;
|
|
|
|
static gint ett_png_chunk = -1;
|
|
|
|
static gint ett_png_chunk_item = -1;
|
|
|
|
|
|
|
|
static dissector_handle_t png_handle;
|
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
static void
|
|
|
|
dissect_png_ihdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|
|
|
{
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_width, tvb, 0, 4, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_height, tvb, 4, 4, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_bitdepth, tvb, 8, 1, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_colour_type, tvb, 9, 1, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_compression_method, tvb, 10, 1, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_filter_method, tvb, 11, 1, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_ihdr_interlace_method, tvb, 12, 1, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2006-08-26 11:57:28 +00:00
|
|
|
static void
|
|
|
|
dissect_png_text(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|
|
|
{
|
|
|
|
int offset=1;
|
|
|
|
|
|
|
|
/* find the null that separates keyword and text string */
|
|
|
|
while(1){
|
|
|
|
if(!tvb_get_guint8(tvb, offset)){
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
offset++;
|
|
|
|
}
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_text_keyword, tvb, 0, offset, ENC_ASCII|ENC_NA);
|
2006-08-26 11:57:28 +00:00
|
|
|
offset++;
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_text_string, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII|ENC_NA);
|
2006-08-26 11:57:28 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_png_time(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|
|
|
{
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_time_year, tvb, 0, 2, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_time_month, tvb, 2, 1, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_time_day, tvb, 3, 1, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_time_hour, tvb, 4, 1, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_time_minute, tvb, 5, 1, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_time_second, tvb, 6, 1, ENC_BIG_ENDIAN);
|
2006-08-26 11:57:28 +00:00
|
|
|
}
|
2006-08-26 09:16:38 +00:00
|
|
|
|
2006-08-26 12:26:19 +00:00
|
|
|
static void
|
|
|
|
dissect_png_phys(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|
|
|
{
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_phys_horiz, tvb, 0, 4, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_phys_vert, tvb, 4, 4, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_phys_unit, tvb, 8, 1, ENC_BIG_ENDIAN);
|
2006-08-26 12:26:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_png_bkgd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
|
|
|
|
{
|
|
|
|
switch(tvb_reported_length(tvb)){
|
|
|
|
case 1: /* colour type 3 */
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_bkgd_palette_index, tvb, 0, 1, ENC_BIG_ENDIAN);
|
2006-08-26 12:26:19 +00:00
|
|
|
break;
|
|
|
|
case 2: /* colour type 0, 4 */
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_bkgd_greyscale, tvb, 0, 2, ENC_BIG_ENDIAN);
|
2006-08-26 12:26:19 +00:00
|
|
|
break;
|
|
|
|
case 6: /* colour type 2, 6 */
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_bkgd_red, tvb, 0, 2, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_bkgd_green, tvb, 2, 2, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(tree, &hfi_png_bkgd_blue, tvb, 4, 2, ENC_BIG_ENDIAN);
|
2006-08-26 12:26:19 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
typedef struct _chunk_dissector_t {
|
|
|
|
guint32 type;
|
2008-06-25 09:12:35 +00:00
|
|
|
const char *name;
|
2006-08-26 09:16:38 +00:00
|
|
|
void (*dissector)(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
|
|
|
|
} chunk_dissector_t;
|
|
|
|
|
|
|
|
static chunk_dissector_t chunk_table[] = {
|
|
|
|
{ 0x49484452, "Image Header", dissect_png_ihdr }, /* IHDR */
|
2006-08-26 12:26:19 +00:00
|
|
|
{ 0x624b4744, "Background colour", dissect_png_bkgd }, /* bKGD */
|
|
|
|
{ 0x70485973, "Physical pixel dimensions",
|
|
|
|
dissect_png_phys }, /* pHYs */
|
2006-08-26 11:57:28 +00:00
|
|
|
{ 0x74455874, "Textual data", dissect_png_text }, /* tEXt */
|
|
|
|
{ 0x74494d45, "Image last-modification time",
|
|
|
|
dissect_png_time }, /* tIME */
|
2006-08-26 09:16:38 +00:00
|
|
|
{ 0x49454e44, "Image Trailer", NULL }, /* IEND */
|
|
|
|
{ 0, NULL, NULL }
|
|
|
|
};
|
|
|
|
|
2011-03-24 02:49:05 +00:00
|
|
|
static gint
|
2012-09-10 21:40:21 +00:00
|
|
|
dissect_png(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
|
2006-08-26 09:16:38 +00:00
|
|
|
{
|
|
|
|
proto_tree *tree = NULL;
|
|
|
|
proto_item *ti;
|
|
|
|
int offset=0;
|
|
|
|
|
2011-03-24 02:49:05 +00:00
|
|
|
/* http://libpng.org/pub/png/spec/1.2/PNG-Structure.html#PNG-file-signature */
|
|
|
|
static const guint8 magic[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
|
|
|
|
if (tvb_length(tvb) < 20)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (tvb_memeql(tvb, 0, magic, sizeof(magic)) != 0)
|
|
|
|
return 0;
|
|
|
|
|
2009-09-24 20:21:23 +00:00
|
|
|
col_append_str(pinfo->cinfo, COL_INFO, " (PNG)");
|
2006-08-26 09:16:38 +00:00
|
|
|
|
|
|
|
if(parent_tree){
|
2013-08-17 08:59:19 +00:00
|
|
|
ti=proto_tree_add_item(parent_tree, hfi_png, tvb, offset, -1, ENC_NA);
|
2006-08-26 09:16:38 +00:00
|
|
|
tree=proto_item_add_subtree(ti, ett_png);
|
|
|
|
}
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(tree, &hfi_png_signature, tvb, offset, 8, ENC_NA);
|
2006-08-26 09:16:38 +00:00
|
|
|
offset+=8;
|
|
|
|
|
2013-04-02 21:13:02 +00:00
|
|
|
while(tvb_reported_length_remaining(tvb, offset) > 0){
|
2006-08-26 09:16:38 +00:00
|
|
|
proto_tree *chunk_tree=NULL;
|
|
|
|
proto_item *it=NULL;
|
|
|
|
guint32 len, type;
|
|
|
|
chunk_dissector_t *cd;
|
|
|
|
char str[5];
|
|
|
|
|
|
|
|
len=tvb_get_ntohl(tvb, offset);
|
|
|
|
type=tvb_get_ntohl(tvb, offset+4);
|
|
|
|
str[0]=tvb_get_guint8(tvb, offset+4);
|
|
|
|
str[1]=tvb_get_guint8(tvb, offset+5);
|
|
|
|
str[2]=tvb_get_guint8(tvb, offset+6);
|
|
|
|
str[3]=tvb_get_guint8(tvb, offset+7);
|
|
|
|
str[4]=0;
|
|
|
|
|
2006-08-28 02:06:28 +00:00
|
|
|
if(tree){
|
2006-08-26 09:16:38 +00:00
|
|
|
it=proto_tree_add_text(tree, tvb, offset, offset+8+len+4, "%s", str);
|
|
|
|
chunk_tree=proto_item_add_subtree(it, ett_png_chunk);
|
|
|
|
}
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(chunk_tree, &hfi_png_chunk_len, tvb, offset, 4, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
offset+=4;
|
|
|
|
|
2006-08-28 02:06:28 +00:00
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
it=proto_tree_add_item(chunk_tree, &hfi_png_chunk_type, tvb, offset, 4, ENC_ASCII|ENC_NA);
|
|
|
|
proto_tree_add_item(chunk_tree, &hfi_png_chunk_flag_anc, tvb, offset, 4, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(chunk_tree, &hfi_png_chunk_flag_priv, tvb, offset, 4, ENC_BIG_ENDIAN);
|
|
|
|
proto_tree_add_item(chunk_tree, &hfi_png_chunk_flag_stc, tvb, offset, 4, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
offset+=4;
|
|
|
|
|
2006-08-28 02:06:28 +00:00
|
|
|
if (len >= 1000000000)
|
|
|
|
THROW(ReportedBoundsError);
|
2006-08-26 09:16:38 +00:00
|
|
|
cd=&chunk_table[0];
|
|
|
|
while(1){
|
|
|
|
if(cd->type==0){
|
|
|
|
cd=NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if(cd->type==type){
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
cd++;
|
|
|
|
}
|
|
|
|
if(chunk_tree){
|
2008-12-17 17:23:37 +00:00
|
|
|
proto_item_append_text(chunk_tree, " %s", cd?cd->name:"(don't know how to dissect this)");
|
2006-08-26 09:16:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if(!cd){
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(chunk_tree, &hfi_png_chunk_data, tvb, offset, len, ENC_NA);
|
2006-08-26 09:16:38 +00:00
|
|
|
} else {
|
|
|
|
if(cd->dissector){
|
|
|
|
tvbuff_t *next_tvb;
|
|
|
|
proto_tree *cti=NULL;
|
|
|
|
|
|
|
|
next_tvb=tvb_new_subset(tvb, offset, MIN(tvb_length_remaining(tvb, offset), (int)len), len);
|
2006-08-28 02:06:28 +00:00
|
|
|
if(it){
|
2006-08-26 09:16:38 +00:00
|
|
|
cti=proto_item_add_subtree(it, ett_png_chunk_item);
|
|
|
|
}
|
|
|
|
cd->dissector(next_tvb, pinfo, cti);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
offset+=len;
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
proto_tree_add_item(chunk_tree, &hfi_png_chunk_crc, tvb, offset, 4, ENC_BIG_ENDIAN);
|
2006-08-26 09:16:38 +00:00
|
|
|
offset+=4;
|
|
|
|
}
|
2011-03-24 02:49:05 +00:00
|
|
|
return offset;
|
2006-08-26 09:16:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_png(void)
|
|
|
|
{
|
2013-11-07 20:14:18 +00:00
|
|
|
#ifndef HAVE_HFI_SECTION_INIT
|
2013-08-17 08:59:19 +00:00
|
|
|
static header_field_info *hfi[] =
|
2006-08-26 09:16:38 +00:00
|
|
|
{
|
2013-08-17 08:59:19 +00:00
|
|
|
&hfi_png_signature,
|
|
|
|
&hfi_png_chunk_type,
|
|
|
|
&hfi_png_chunk_data,
|
|
|
|
&hfi_png_chunk_len,
|
|
|
|
&hfi_png_chunk_crc,
|
|
|
|
&hfi_png_chunk_flag_anc,
|
|
|
|
&hfi_png_chunk_flag_priv,
|
|
|
|
&hfi_png_chunk_flag_stc,
|
|
|
|
&hfi_png_ihdr_width,
|
|
|
|
&hfi_png_ihdr_height,
|
|
|
|
&hfi_png_ihdr_bitdepth,
|
|
|
|
&hfi_png_ihdr_colour_type,
|
|
|
|
&hfi_png_ihdr_compression_method,
|
|
|
|
&hfi_png_ihdr_filter_method,
|
|
|
|
&hfi_png_ihdr_interlace_method,
|
|
|
|
&hfi_png_text_keyword,
|
|
|
|
&hfi_png_text_string,
|
|
|
|
&hfi_png_time_year,
|
|
|
|
&hfi_png_time_month,
|
|
|
|
&hfi_png_time_day,
|
|
|
|
&hfi_png_time_hour,
|
|
|
|
&hfi_png_time_minute,
|
|
|
|
&hfi_png_time_second,
|
|
|
|
&hfi_png_phys_horiz,
|
|
|
|
&hfi_png_phys_vert,
|
|
|
|
&hfi_png_phys_unit,
|
|
|
|
&hfi_png_bkgd_palette_index,
|
|
|
|
&hfi_png_bkgd_greyscale,
|
|
|
|
&hfi_png_bkgd_red,
|
|
|
|
&hfi_png_bkgd_green,
|
|
|
|
&hfi_png_bkgd_blue,
|
2006-08-26 09:16:38 +00:00
|
|
|
};
|
2013-11-07 20:14:18 +00:00
|
|
|
#endif
|
2006-08-26 09:16:38 +00:00
|
|
|
|
|
|
|
static gint *ett[] =
|
|
|
|
{
|
|
|
|
&ett_png,
|
|
|
|
&ett_png_chunk,
|
|
|
|
&ett_png_chunk_item,
|
|
|
|
};
|
|
|
|
|
2013-08-17 08:59:19 +00:00
|
|
|
int proto_png;
|
2006-08-26 09:16:38 +00:00
|
|
|
|
|
|
|
proto_png = proto_register_protocol("Portable Network Graphics","PNG","png");
|
2013-08-17 08:59:19 +00:00
|
|
|
hfi_png = proto_registrar_get_nth(proto_png);
|
|
|
|
|
|
|
|
proto_register_fields(proto_png, hfi, array_length(hfi));
|
2006-08-26 09:16:38 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2013-08-05 18:09:43 +00:00
|
|
|
|
|
|
|
png_handle = new_register_dissector("png", dissect_png, proto_png);
|
2006-08-26 09:16:38 +00:00
|
|
|
}
|
|
|
|
|
2012-09-10 21:40:21 +00:00
|
|
|
static gboolean dissect_png_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
2011-03-22 16:43:16 +00:00
|
|
|
{
|
2012-09-10 21:40:21 +00:00
|
|
|
return dissect_png(tvb, pinfo, tree, NULL) > 0;
|
2011-03-22 16:43:16 +00:00
|
|
|
}
|
|
|
|
|
2006-08-26 09:16:38 +00:00
|
|
|
void
|
|
|
|
proto_reg_handoff_png(void)
|
|
|
|
{
|
|
|
|
dissector_add_string("media_type", "image/png", png_handle);
|
2013-08-17 08:59:19 +00:00
|
|
|
heur_dissector_add("http", dissect_png_heur, hfi_png->id);
|
|
|
|
heur_dissector_add("wtap_file", dissect_png_heur, hfi_png->id);
|
2006-08-26 09:16:38 +00:00
|
|
|
}
|