diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-12-13 09:53:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-12-13 09:53:50 +0000 |
| commit | d94bd07f99438278cb11f24b00571ab2907b6bdb (patch) | |
| tree | 5f96d0a35c97af466bcb2d5b8a9371327bb0190f /wiretap/packetlogger.c | |
| parent | 1df4ee91090e35c25835204d7175b9395be32606 (diff) | |
| download | wireshark-d94bd07f99438278cb11f24b00571ab2907b6bdb.tar.gz | |
Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports any
form of corruption/bogosity in a file, including in a file header as
well as in records in the file. Change the error message
wtap_strerror() returns for it to reflect that.
Use it for some file header problems for which it wasn't already being
used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only
be used for files that we have no reason to believe are invalid but that
have a version number we don't know about or some other
non-link-layer-encapsulation-type value we don't know about.
svn path=/trunk/; revision=40175
Diffstat (limited to 'wiretap/packetlogger.c')
| -rw-r--r-- | wiretap/packetlogger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index afe918f9a9..7e03b79a52 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -102,7 +102,7 @@ packetlogger_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) return FALSE; if (pl_hdr.len < 8) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("packetlogger: record length %u is too small", pl_hdr.len); return FALSE; } @@ -111,7 +111,7 @@ packetlogger_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) * Probably a corrupt capture file; don't blow up trying * to allocate space for an immensely-large packet. */ - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("packetlogger: File has %u-byte packet, bigger than maximum of %u", pl_hdr.len - 8, WTAP_MAX_PACKET_SIZE); return FALSE; @@ -159,7 +159,7 @@ packetlogger_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header } if(length != (int)pl_hdr.len - 8) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("packetlogger: record length %u doesn't match requested length %d", pl_hdr.len, length); return FALSE; } |