2007-03-22 10:44:33 +00:00
|
|
|
/* mpeg.c
|
|
|
|
*
|
|
|
|
* MPEG file format decoder for the Wiretap library.
|
|
|
|
* Written by Shaun Jackman <sjackman@gmail.com>
|
|
|
|
* Copyright 2007 Shaun Jackman
|
|
|
|
*
|
|
|
|
* Wiretap Library
|
2018-02-07 11:26:45 +00:00
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
2007-03-22 10:44:33 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2007-03-22 11:33:18 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
2007-03-22 10:44:33 +00:00
|
|
|
#include "mpeg.h"
|
2008-05-20 21:51:01 +00:00
|
|
|
#include "wsutil/mpeg-audio.h"
|
2007-03-22 10:44:33 +00:00
|
|
|
|
|
|
|
#include "wtap-int.h"
|
2014-07-15 23:40:46 +00:00
|
|
|
#include <wsutil/buffer.h>
|
2007-03-22 10:44:33 +00:00
|
|
|
#include "file_wrappers.h"
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
#define PES_PREFIX 1
|
|
|
|
#define PES_VALID(n) (((n) >> 8 & 0xffffff) == PES_PREFIX)
|
|
|
|
|
2010-02-26 07:59:54 +00:00
|
|
|
typedef struct {
|
2013-11-09 10:38:02 +00:00
|
|
|
nstime_t now;
|
2010-02-26 07:59:54 +00:00
|
|
|
time_t t0;
|
|
|
|
} mpeg_t;
|
|
|
|
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
static int mpeg_file_type_subtype = -1;
|
|
|
|
|
|
|
|
void register_mpeg(void);
|
|
|
|
|
2013-11-08 17:17:57 +00:00
|
|
|
static int
|
2013-12-31 23:51:10 +00:00
|
|
|
mpeg_resync(FILE_T fh, int *err)
|
2007-03-22 10:44:33 +00:00
|
|
|
{
|
2013-12-31 23:51:10 +00:00
|
|
|
gint64 offset = file_tell(fh);
|
2009-03-09 21:18:55 +00:00
|
|
|
int count = 0;
|
2013-12-31 23:51:10 +00:00
|
|
|
int byte = file_getc(fh);
|
2007-03-22 10:44:33 +00:00
|
|
|
|
2008-06-23 20:06:20 +00:00
|
|
|
while (byte != EOF) {
|
|
|
|
if (byte == 0xff && count > 0) {
|
2013-12-31 23:51:10 +00:00
|
|
|
byte = file_getc(fh);
|
2008-06-23 20:06:20 +00:00
|
|
|
if (byte != EOF && (byte & 0xe0) == 0xe0)
|
2007-03-22 10:44:33 +00:00
|
|
|
break;
|
|
|
|
} else
|
2013-12-31 23:51:10 +00:00
|
|
|
byte = file_getc(fh);
|
2007-03-22 10:44:33 +00:00
|
|
|
count++;
|
|
|
|
}
|
2013-12-31 23:51:10 +00:00
|
|
|
if (file_seek(fh, offset, SEEK_SET, err) == -1)
|
2011-03-31 18:28:52 +00:00
|
|
|
return 0;
|
2007-03-22 10:44:33 +00:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2007-08-21 22:00:06 +00:00
|
|
|
#define SCRHZ 27000000
|
|
|
|
|
2013-11-08 17:17:57 +00:00
|
|
|
static gboolean
|
2018-02-09 00:19:12 +00:00
|
|
|
mpeg_read_packet(wtap *wth, FILE_T fh, wtap_rec *rec, Buffer *buf,
|
2013-12-31 23:51:10 +00:00
|
|
|
gboolean is_random, int *err, gchar **err_info)
|
2007-03-22 10:44:33 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
mpeg_t *mpeg = (mpeg_t *)wth->priv;
|
2007-03-22 10:44:33 +00:00
|
|
|
guint32 n;
|
2009-03-09 21:18:55 +00:00
|
|
|
unsigned int packet_size;
|
2013-11-09 10:38:02 +00:00
|
|
|
nstime_t ts = mpeg->now;
|
2007-03-22 10:44:33 +00:00
|
|
|
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
/*
|
|
|
|
* All packets have at least 4 bytes in them. Read the first
|
|
|
|
* 4 bytes and determine whether it's a PES packet or not
|
|
|
|
* based on that.
|
|
|
|
*
|
|
|
|
* XXX - can an MPEG file contain a mixture of PES and non-PES
|
|
|
|
* packets? If not, can we determine whether the packets will
|
|
|
|
* be PES packets or not based on the magic number (i.e., if the
|
|
|
|
* file begins with 0x00 0x00 0x01, it contains PES packets,
|
|
|
|
* otherwise it doesn't)?
|
|
|
|
*/
|
|
|
|
if (!wtap_read_bytes_or_eof(fh, &n, sizeof n, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (file_seek(fh, -(gint64)(sizeof n), SEEK_CUR, err) == -1)
|
|
|
|
return FALSE;
|
|
|
|
n = g_ntohl(n);
|
2007-03-22 10:44:33 +00:00
|
|
|
if (PES_VALID(n)) {
|
2013-12-31 23:51:10 +00:00
|
|
|
gint64 offset = file_tell(fh);
|
2007-03-22 10:44:33 +00:00
|
|
|
guint8 stream;
|
|
|
|
|
2016-09-28 23:45:23 +00:00
|
|
|
if (!wtap_read_bytes(fh, NULL, 3, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
|
|
|
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (!wtap_read_bytes(fh, &stream, sizeof stream, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (stream == 0xba) {
|
|
|
|
guint32 pack1;
|
|
|
|
guint32 pack0;
|
|
|
|
guint64 pack;
|
|
|
|
guint8 stuffing;
|
|
|
|
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (!wtap_read_bytes(fh, &pack1, sizeof pack1, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (!wtap_read_bytes(fh, &pack0, sizeof pack0, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
|
|
|
pack = (guint64)g_ntohl(pack1) << 32 | g_ntohl(pack0);
|
|
|
|
|
|
|
|
switch (pack >> 62) {
|
|
|
|
case 1:
|
2016-09-28 23:45:23 +00:00
|
|
|
if (!wtap_read_bytes(fh, NULL, 1, err,
|
|
|
|
err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (!wtap_read_bytes(fh, &stuffing,
|
|
|
|
sizeof stuffing, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
|
|
|
stuffing &= 0x07;
|
|
|
|
packet_size = 14 + stuffing;
|
|
|
|
|
2013-12-31 23:51:10 +00:00
|
|
|
if (!is_random) {
|
2007-08-21 22:00:06 +00:00
|
|
|
guint64 bytes = pack >> 16;
|
2008-06-23 20:06:20 +00:00
|
|
|
guint64 ts_val =
|
2007-08-21 22:00:06 +00:00
|
|
|
(bytes >> 43 & 0x0007) << 30 |
|
|
|
|
(bytes >> 27 & 0x7fff) << 15 |
|
|
|
|
(bytes >> 11 & 0x7fff) << 0;
|
2013-01-04 05:22:43 +00:00
|
|
|
guint ext = (guint)((bytes >> 1) & 0x1ff);
|
2008-06-23 20:06:20 +00:00
|
|
|
guint64 cr = 300 * ts_val + ext;
|
2013-01-04 05:22:43 +00:00
|
|
|
guint rem = (guint)(cr % SCRHZ);
|
2010-02-26 07:59:54 +00:00
|
|
|
mpeg->now.secs
|
|
|
|
= mpeg->t0 + (time_t)(cr / SCRHZ);
|
|
|
|
mpeg->now.nsecs
|
2007-08-22 02:45:42 +00:00
|
|
|
= (int)(G_GINT64_CONSTANT(1000000000) * rem / SCRHZ);
|
2007-08-21 22:00:06 +00:00
|
|
|
}
|
2010-02-26 07:59:54 +00:00
|
|
|
ts = mpeg->now;
|
2007-03-22 10:44:33 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
packet_size = 12;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
guint16 length;
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (!wtap_read_bytes(fh, &length, sizeof length, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
|
|
|
length = g_ntohs(length);
|
|
|
|
packet_size = 6 + length;
|
|
|
|
}
|
|
|
|
|
2013-12-31 23:51:10 +00:00
|
|
|
if (file_seek(fh, offset, SEEK_SET, err) == -1)
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
|
|
|
} else {
|
|
|
|
struct mpa mpa;
|
|
|
|
|
|
|
|
MPA_UNMARSHAL(&mpa, n);
|
|
|
|
if (MPA_VALID(&mpa)) {
|
|
|
|
packet_size = MPA_BYTES(&mpa);
|
2013-12-31 23:51:10 +00:00
|
|
|
if (!is_random) {
|
|
|
|
mpeg->now.nsecs += MPA_DURATION_NS(&mpa);
|
|
|
|
if (mpeg->now.nsecs >= 1000000000) {
|
|
|
|
mpeg->now.secs++;
|
|
|
|
mpeg->now.nsecs -= 1000000000;
|
|
|
|
}
|
2007-03-22 10:44:33 +00:00
|
|
|
}
|
|
|
|
} else {
|
2022-03-08 03:06:14 +00:00
|
|
|
if ((n & 0xffffff00) == 0x49443300) {
|
|
|
|
/* We have an ID3v2 header; read the size */
|
|
|
|
if (file_seek(fh, 6, SEEK_CUR, err) == -1)
|
|
|
|
return FALSE;
|
|
|
|
if (!wtap_read_bytes_or_eof(fh, &n, sizeof n, err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
if (file_seek(fh, -(gint64)(6+sizeof(n)), SEEK_CUR, err) == -1)
|
|
|
|
return FALSE;
|
|
|
|
n = g_ntohl(n);
|
|
|
|
|
|
|
|
/* ID3v2 size does not include the 10-byte header */
|
|
|
|
packet_size = decode_synchsafe_int(n) + 10;
|
|
|
|
} else {
|
|
|
|
packet_size = mpeg_resync(fh, err);
|
|
|
|
}
|
|
|
|
|
2007-03-22 10:44:33 +00:00
|
|
|
if (packet_size == 0)
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-31 23:51:10 +00:00
|
|
|
if (!wtap_read_packet_bytes(fh, buf, packet_size, err, err_info))
|
2007-03-22 10:44:33 +00:00
|
|
|
return FALSE;
|
2013-12-31 23:51:10 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_type = REC_TYPE_PACKET;
|
2021-08-30 02:12:13 +00:00
|
|
|
rec->block = wtap_block_create(WTAP_BLOCK_PACKET);
|
2014-05-24 18:28:30 +00:00
|
|
|
|
2020-05-01 21:24:05 +00:00
|
|
|
rec->presence_flags = 0; /* we may or may not have a time stamp */
|
2013-12-31 23:51:10 +00:00
|
|
|
if (!is_random) {
|
2020-05-01 21:24:05 +00:00
|
|
|
/* XXX - relative, not absolute, time stamps */
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->presence_flags = WTAP_HAS_TS;
|
|
|
|
rec->ts = ts;
|
2013-12-31 23:51:10 +00:00
|
|
|
}
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.caplen = packet_size;
|
|
|
|
rec->rec_header.packet_header.len = packet_size;
|
2013-12-31 23:51:10 +00:00
|
|
|
|
2007-03-22 10:44:33 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean
|
2019-04-05 01:56:27 +00:00
|
|
|
mpeg_read(wtap *wth, wtap_rec *rec, Buffer *buf, int *err,
|
|
|
|
gchar **err_info, gint64 *data_offset)
|
2013-12-31 23:51:10 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
*data_offset = file_tell(wth->fh);
|
2013-12-31 23:51:10 +00:00
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
return mpeg_read_packet(wth, wth->fh, rec, buf, FALSE, err, err_info);
|
2013-12-31 23:51:10 +00:00
|
|
|
}
|
|
|
|
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean
|
2014-05-09 05:18:49 +00:00
|
|
|
mpeg_seek_read(wtap *wth, gint64 seek_off,
|
2018-02-09 00:19:12 +00:00
|
|
|
wtap_rec *rec, Buffer *buf,
|
2011-04-21 09:41:52 +00:00
|
|
|
int *err, gchar **err_info)
|
2007-03-22 10:44:33 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2013-12-31 23:51:10 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
if (!mpeg_read_packet(wth, wth->random_fh, rec, buf, TRUE, err,
|
2013-12-31 23:51:10 +00:00
|
|
|
err_info)) {
|
|
|
|
if (*err == 0)
|
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2013-12-31 23:51:10 +00:00
|
|
|
}
|
2014-05-23 10:50:02 +00:00
|
|
|
return TRUE;
|
2007-03-22 10:44:33 +00:00
|
|
|
}
|
|
|
|
|
2007-03-25 19:00:59 +00:00
|
|
|
struct _mpeg_magic {
|
|
|
|
size_t len;
|
2007-04-21 22:58:03 +00:00
|
|
|
const gchar* match;
|
2007-03-25 19:00:59 +00:00
|
|
|
} magic[] = {
|
2007-08-06 22:34:26 +00:00
|
|
|
{ 3, "TAG" }, /* ID3v1 */
|
|
|
|
{ 3, "ID3" }, /* ID3v2 */
|
|
|
|
{ 3, "\0\0\1" }, /* MPEG PES */
|
2019-07-28 04:20:27 +00:00
|
|
|
{ 2, "\xff\xfb" }, /* MP3, taken from https://en.wikipedia.org/wiki/MP3#File_structure */
|
2007-08-06 22:34:26 +00:00
|
|
|
{ 0, NULL }
|
2007-03-25 19:00:59 +00:00
|
|
|
};
|
|
|
|
|
2014-10-09 23:44:15 +00:00
|
|
|
wtap_open_return_val
|
2014-05-09 05:18:49 +00:00
|
|
|
mpeg_open(wtap *wth, int *err, gchar **err_info)
|
2007-03-22 10:44:33 +00:00
|
|
|
{
|
2007-03-25 19:00:59 +00:00
|
|
|
char magic_buf[16];
|
All private data for a capture in a Wiretap module must be per-file, not
static to the module.
Add the older(?) ID tag for MPEG audio.
Just use the ID at the beginning to identify MPEG audio files; don't
check the file any further.
If the read of the magic number doesn't work, get the error, and, if
there is no error (i.e., it's a short read), just return 0 (meaning "no
error, but this isn't that type of file).
Similarly, if the magic number doesn't match, just return 0, so other
types of file are tried.
svn path=/trunk/; revision=21192
2007-03-25 22:07:40 +00:00
|
|
|
struct _mpeg_magic* m;
|
2010-02-26 07:59:54 +00:00
|
|
|
mpeg_t *mpeg;
|
2013-11-08 17:17:57 +00:00
|
|
|
|
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07 01:00:57 +00:00
|
|
|
if (!wtap_read_bytes(wth->fh, magic_buf, sizeof magic_buf,
|
|
|
|
err, err_info)) {
|
|
|
|
if (*err != WTAP_ERR_SHORT_READ)
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
2007-03-25 19:00:59 +00:00
|
|
|
}
|
|
|
|
|
2008-07-09 19:15:50 +00:00
|
|
|
for (m=magic; m->match; m++) {
|
|
|
|
if (memcmp(magic_buf, m->match, m->len) == 0)
|
2007-03-25 19:00:59 +00:00
|
|
|
goto good_magic;
|
|
|
|
}
|
2013-11-08 17:17:57 +00:00
|
|
|
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_NOT_MINE;
|
All private data for a capture in a Wiretap module must be per-file, not
static to the module.
Add the older(?) ID tag for MPEG audio.
Just use the ID at the beginning to identify MPEG audio files; don't
check the file any further.
If the read of the magic number doesn't work, get the error, and, if
there is no error (i.e., it's a short read), just return 0 (meaning "no
error, but this isn't that type of file).
Similarly, if the magic number doesn't match, just return 0, so other
types of file are tried.
svn path=/trunk/; revision=21192
2007-03-25 22:07:40 +00:00
|
|
|
|
2007-03-25 19:00:59 +00:00
|
|
|
good_magic:
|
All private data for a capture in a Wiretap module must be per-file, not
static to the module.
Add the older(?) ID tag for MPEG audio.
Just use the ID at the beginning to identify MPEG audio files; don't
check the file any further.
If the read of the magic number doesn't work, get the error, and, if
there is no error (i.e., it's a short read), just return 0 (meaning "no
error, but this isn't that type of file).
Similarly, if the magic number doesn't match, just return 0, so other
types of file are tried.
svn path=/trunk/; revision=21192
2007-03-25 22:07:40 +00:00
|
|
|
/* This appears to be a file with MPEG data. */
|
2014-05-09 05:18:49 +00:00
|
|
|
if (file_seek(wth->fh, 0, SEEK_SET, err) == -1)
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_ERROR;
|
2007-03-22 10:44:33 +00:00
|
|
|
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
wth->file_type_subtype = mpeg_file_type_subtype;
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->file_encap = WTAP_ENCAP_MPEG;
|
2014-09-28 18:37:06 +00:00
|
|
|
wth->file_tsprec = WTAP_TSPREC_NSEC;
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->subtype_read = mpeg_read;
|
|
|
|
wth->subtype_seek_read = mpeg_seek_read;
|
|
|
|
wth->snapshot_length = 0;
|
All private data for a capture in a Wiretap module must be per-file, not
static to the module.
Add the older(?) ID tag for MPEG audio.
Just use the ID at the beginning to identify MPEG audio files; don't
check the file any further.
If the read of the magic number doesn't work, get the error, and, if
there is no error (i.e., it's a short read), just return 0 (meaning "no
error, but this isn't that type of file).
Similarly, if the magic number doesn't match, just return 0, so other
types of file are tried.
svn path=/trunk/; revision=21192
2007-03-25 22:07:40 +00:00
|
|
|
|
2020-12-21 02:30:28 +00:00
|
|
|
mpeg = g_new(mpeg_t, 1);
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->priv = (void *)mpeg;
|
2012-02-25 23:24:34 +00:00
|
|
|
mpeg->now.secs = 0;
|
2010-02-26 07:59:54 +00:00
|
|
|
mpeg->now.nsecs = 0;
|
|
|
|
mpeg->t0 = mpeg->now.secs;
|
All private data for a capture in a Wiretap module must be per-file, not
static to the module.
Add the older(?) ID tag for MPEG audio.
Just use the ID at the beginning to identify MPEG audio files; don't
check the file any further.
If the read of the magic number doesn't work, get the error, and, if
there is no error (i.e., it's a short read), just return 0 (meaning "no
error, but this isn't that type of file).
Similarly, if the magic number doesn't match, just return 0, so other
types of file are tried.
svn path=/trunk/; revision=21192
2007-03-25 22:07:40 +00:00
|
|
|
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_MINE;
|
2007-03-22 10:44:33 +00:00
|
|
|
}
|
2015-01-02 00:45:22 +00:00
|
|
|
|
wiretap: have file handlers advertise blocks and options supported.
Instead of a "supports name resolution" Boolean and bitflags for types of
comments supported, provide a list of block types that the file
type/subtype supports, with each block type having a list of options
supported. Indicate whether "supported" means "one instance" or
"multiple instances".
"Supports" doesn't just mean "can be written", it also means "could be
read".
Rename WTAP_BLOCK_IF_DESCRIPTION to WTAP_BLOCK_IF_ID_AND_INFO, to
indicate that it provides, in addition to information about the
interface, an ID (implicitly, in pcapng files, by its ordinal number)
that is associated with every packet in the file. Emphasize that in
comments - just because your capture file format can list the interfaces
on which a capture was done, that doesn't mean it supports this; it
doesn't do so if the file doesn't indicate, for every packet, on which
of those interfaces it was captured (I'm looking at *you*, Microsoft
Network Monitor...).
Use APIs to query that information to do what the "does this file
type/subtype support name resolution information", "does this file
type/subtype support all of these comment types", and "does this file
type/subtype support - and require - interface IDs" APIs did.
Provide backwards compatibility for Lua.
This allows us to eliminate the WTAP_FILE_TYPE_SUBTYPE_ values for IBM's
iptrace; do so.
2021-02-21 22:18:04 +00:00
|
|
|
static const struct supported_block_type mpeg_blocks_supported[] = {
|
|
|
|
/*
|
|
|
|
* This is a file format that we dissect, so we provide
|
|
|
|
* only one "packet" with the file's contents, and don't
|
|
|
|
* support any options.
|
|
|
|
*/
|
|
|
|
{ WTAP_BLOCK_PACKET, ONE_BLOCK_SUPPORTED, NO_OPTIONS_SUPPORTED }
|
|
|
|
};
|
|
|
|
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
static const struct file_type_subtype_info mpeg_info = {
|
|
|
|
"MPEG", "mpeg", "mpeg", "mpg;mp3",
|
wiretap: have file handlers advertise blocks and options supported.
Instead of a "supports name resolution" Boolean and bitflags for types of
comments supported, provide a list of block types that the file
type/subtype supports, with each block type having a list of options
supported. Indicate whether "supported" means "one instance" or
"multiple instances".
"Supports" doesn't just mean "can be written", it also means "could be
read".
Rename WTAP_BLOCK_IF_DESCRIPTION to WTAP_BLOCK_IF_ID_AND_INFO, to
indicate that it provides, in addition to information about the
interface, an ID (implicitly, in pcapng files, by its ordinal number)
that is associated with every packet in the file. Emphasize that in
comments - just because your capture file format can list the interfaces
on which a capture was done, that doesn't mean it supports this; it
doesn't do so if the file doesn't indicate, for every packet, on which
of those interfaces it was captured (I'm looking at *you*, Microsoft
Network Monitor...).
Use APIs to query that information to do what the "does this file
type/subtype support name resolution information", "does this file
type/subtype support all of these comment types", and "does this file
type/subtype support - and require - interface IDs" APIs did.
Provide backwards compatibility for Lua.
This allows us to eliminate the WTAP_FILE_TYPE_SUBTYPE_ values for IBM's
iptrace; do so.
2021-02-21 22:18:04 +00:00
|
|
|
FALSE, BLOCKS_SUPPORTED(mpeg_blocks_supported),
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
NULL, NULL, NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
void register_mpeg(void)
|
|
|
|
{
|
2021-02-24 03:10:35 +00:00
|
|
|
mpeg_file_type_subtype = wtap_register_file_type_subtype(&mpeg_info);
|
wiretap: more work on file type/subtypes.
Provide a wiretap routine to get an array of all savable file
type/subtypes, sorted with pcap and pcapng at the top, followed by the
other types, sorted either by the name or the description.
Use that routine to list options for the -F flag for various commands
Rename wtap_get_savable_file_types_subtypes() to
wtap_get_savable_file_types_subtypes_for_file(), to indicate that it
provides an array of all file type/subtypes in which a given file can be
saved. Have it sort all types, other than the default type/subtype and,
if there is one, the "other" type (both of which are put at the top), by
the name or the description.
Don't allow wtap_register_file_type_subtypes() to override any existing
registrations; have them always register a new type. In that routine,
if there are any emply slots in the table, due to an entry being
unregistered, use it rather than allocating a new slot.
Don't allow unregistration of built-in types.
Rename the "dump open table" to the "file type/subtype table", as it has
entries for all types/subtypes, even if we can't write them.
Initialize that table in a routine that pre-allocates the GArray before
filling it with built-in types/subtypes, so it doesn't keep getting
reallocated.
Get rid of wtap_num_file_types_subtypes - it's just a copy of the size
of the GArray.
Don't have wtap_file_type_subtype_description() crash if handed an
file type/subtype that isn't a valid array index - just return NULL, as
we do with wtap_file_type_subtype_name().
In wtap_name_to_file_type_subtype(), don't use WTAP_FILE_TYPE_SUBTYPE_
names for the backwards-compatibility names - map those names to the
current names, and then look them up. This reduces the number of
uses of hardwired WTAP_FILE_TYPE_SUBTYPE_ values.
Clean up the type of wtap_module_count - it has no need to be a gulong.
Have built-in wiretap file handlers register names to be used for their
file type/subtypes, rather than building the table in init.lua.
Add a new Lua C function get_wtap_filetypes() to construct the
wtap_filetypes table, based on the registered names, and use it in
init.lua.
Add a #define WSLUA_INTERNAL_FUNCTION to register functions intended
only for internal use in init.lua, so they can be made available from
Lua without being documented.
Get rid of WTAP_NUM_FILE_TYPES_SUBTYPES - most code has no need to use
it, as it can just request arrays of types, and the space of
type/subtype codes can be sparse due to registration in any case, so
code has to be careful using it.
wtap_get_num_file_types_subtypes() is no longer used, so remove it. It
returns the number of elements in the file type/subtype array, which is
not necessarily the name of known file type/subtypes, as there may have
been some deregistered types, and those types do *not* get removed from
the array, they just get cleared so that they're available for future
allocation (we don't want the indices of any registered types to changes
if another type is deregistered, as those indicates are the type/subtype
values, so we can't shrink the array).
Clean up white space and remove some comments that shouldn't have been
added.
2021-02-17 06:24:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Register name for backwards compatibility with the
|
|
|
|
* wtap_filetypes table in Lua.
|
|
|
|
*/
|
|
|
|
wtap_register_backwards_compatibility_lua_name("MPEG",
|
|
|
|
mpeg_file_type_subtype);
|
wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().
This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler). (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)
A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.
Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine. In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.
Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.
While we're at it, add modelines to a file that lacked them.
2021-02-14 08:34:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-02 00:45:22 +00:00
|
|
|
/*
|
2019-07-26 18:43:17 +00:00
|
|
|
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
2015-01-02 00:45:22 +00:00
|
|
|
*
|
|
|
|
* Local variables:
|
|
|
|
* c-basic-offset: 8
|
|
|
|
* tab-width: 8
|
|
|
|
* indent-tabs-mode: t
|
|
|
|
* End:
|
|
|
|
*
|
|
|
|
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
|
|
|
* :indentSize=8:tabSize=8:noTabs=false:
|
|
|
|
*/
|