diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-02-04 02:24:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-02-04 02:24:33 +0000 |
| commit | 17d1226a56d30577057ab0bd3cce56e4bdfb416a (patch) | |
| tree | 262ace17c52b2837f8ec5e85d8eaf7558cb1c505 /wiretap | |
| parent | 84af13f0800be5018d6e396dd3db960706d95412 (diff) | |
Put more data into the "additional error information" messages.
Get rid of debugging printouts that are equivalent to the "additional
error information" messages.
Return additional error info for all WTAP_ERR_BAD_RECORD errors.
svn path=/trunk/; revision=35800
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcapng.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index e2d2a310d9..d9c64dcf36 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -518,7 +518,6 @@ pcapng_read_section_header_block(FILE_T fh, gboolean first_block, } if (pn->interface_data != NULL) { - pcapng_debug0("pcapng_read_section_header_block: Multiple section header blocks!"); g_array_free(pn->interface_data, TRUE); pn->interface_data = NULL; *err = WTAP_ERR_BAD_RECORD; @@ -803,17 +802,15 @@ pcapng_read_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wta } if (wblock->data.packet.cap_len > wblock->data.packet.packet_len) { - pcapng_debug2("pcapng_read_packet_block:cap_len %d is larger than packet_len %u.", - wblock->data.packet.cap_len, wblock->data.packet.packet_len); *err = WTAP_ERR_BAD_RECORD; - *err_info = g_strdup("pcapng_read_packet_block:cap_len is larger than packet_len"); + *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than packet_len %u.", + wblock->data.packet.cap_len, wblock->data.packet.packet_len); return 0; } if (wblock->data.packet.cap_len > WTAP_MAX_PACKET_SIZE) { - pcapng_debug2("pcapng_read_packet_block:cap_len %d is larger than WTAP_MAX_PACKET_SIZE %u.", - wblock->data.packet.cap_len, WTAP_MAX_PACKET_SIZE); *err = WTAP_ERR_BAD_RECORD; - *err_info = g_strdup("pcapng_read_packet_block:cap_len is larger than WTAP_MAX_PACKET_SIZE"); + *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u.", + wblock->data.packet.cap_len, WTAP_MAX_PACKET_SIZE); return 0; } pcapng_debug3("pcapng_read_packet_block: packet data: packet_len %u captured_len %u interface_id %u", @@ -975,9 +972,9 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t * - (guint32)sizeof(bh->block_total_length); if (wblock->data.simple_packet.cap_len > WTAP_MAX_PACKET_SIZE) { - pcapng_debug2("pcapng_read_simple_packet_block:cap_len %d is larger than WTAP_MAX_PACKET_SIZE %u.", - wblock->data.simple_packet.cap_len, WTAP_MAX_PACKET_SIZE); *err = WTAP_ERR_BAD_RECORD; + *err_info = g_strdup_printf("pcapng_read_simple_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u.", + wblock->data.simple_packet.cap_len, WTAP_MAX_PACKET_SIZE); return 0; } pcapng_debug1("pcapng_read_simple_packet_block: packet data: packet_len %u", @@ -1402,10 +1399,10 @@ pcapng_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wth->phdr.ts.secs = (time_t)(ts / time_units_per_second); wth->phdr.ts.nsecs = (int)(((ts % time_units_per_second) * 1000000000) / time_units_per_second); } else { - pcapng_debug1("pcapng_read: interface_id %d too large", wblock.data.packet.interface_id); wth->phdr.pkt_encap = WTAP_ENCAP_UNKNOWN; *err = WTAP_ERR_BAD_RECORD; - *err_info = g_strdup_printf("pcapng: interface index %u is too large", wblock.data.packet.interface_id); + *err_info = g_strdup_printf("pcapng: interface index %u is not less than interface count %u.", + wblock.data.packet.interface_id, pcapng->number_of_interfaces); return FALSE; } |