1999-12-12 22:40:10 +00:00
|
|
|
/* i4btrace.c
|
|
|
|
|
*
|
|
|
|
|
* Wiretap Library
|
|
|
|
|
* Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
|
|
|
|
|
*
|
2018-02-07 11:26:45 +00:00
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
1999-12-12 22:40:10 +00:00
|
|
|
*/
|
2002-03-04 00:25:35 +00:00
|
|
|
|
1999-12-12 22:40:10 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <errno.h>
|
2000-11-17 21:00:40 +00:00
|
|
|
#include <string.h>
|
2000-05-19 23:07:04 +00:00
|
|
|
#include "wtap-int.h"
|
2000-01-13 07:09:20 +00:00
|
|
|
#include "file_wrappers.h"
|
1999-12-12 22:40:10 +00:00
|
|
|
#include "i4b_trace.h"
|
2005-08-02 04:23:39 +00:00
|
|
|
#include "i4btrace.h"
|
1999-12-12 22:40:10 +00:00
|
|
|
|
2010-02-26 07:59:54 +00:00
|
|
|
typedef struct {
|
|
|
|
|
gboolean byte_swapped;
|
|
|
|
|
} i4btrace_t;
|
|
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
static gboolean i4btrace_read(wtap *wth, wtap_rec *rec, Buffer *buf,
|
|
|
|
|
int *err, gchar **err_info, gint64 *offset);
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean i4btrace_seek_read(wtap *wth, gint64 seek_off,
|
2018-02-09 00:19:12 +00:00
|
|
|
wtap_rec *rec, Buffer *buf, int *err, gchar **err_info);
|
|
|
|
|
static int i4b_read_rec(wtap *wth, FILE_T fh, wtap_rec *rec,
|
2013-06-17 21:18:47 +00:00
|
|
|
Buffer *buf, int *err, gchar **err_info);
|
1999-12-12 22:40:10 +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
|
|
|
static int i4btrace_file_type_subtype = -1;
|
|
|
|
|
|
|
|
|
|
void register_i4btrace(void);
|
|
|
|
|
|
2019-09-02 21:23:33 +00:00
|
|
|
/*
|
|
|
|
|
* Byte-swap the header.
|
|
|
|
|
*/
|
|
|
|
|
#define I4B_BYTESWAP_HEADER(hdr) \
|
|
|
|
|
{ \
|
|
|
|
|
hdr.length = GUINT32_SWAP_LE_BE(hdr.length); \
|
|
|
|
|
hdr.unit = GUINT32_SWAP_LE_BE(hdr.unit); \
|
|
|
|
|
hdr.type = GUINT32_SWAP_LE_BE(hdr.type); \
|
|
|
|
|
hdr.dir = GUINT32_SWAP_LE_BE(hdr.dir); \
|
|
|
|
|
hdr.trunc = GUINT32_SWAP_LE_BE(hdr.trunc); \
|
|
|
|
|
hdr.count = GUINT32_SWAP_LE_BE(hdr.count); \
|
|
|
|
|
hdr.ts_sec = GUINT32_SWAP_LE_BE(hdr.ts_sec); \
|
|
|
|
|
hdr.ts_usec = GUINT32_SWAP_LE_BE(hdr.ts_usec); \
|
|
|
|
|
}
|
|
|
|
|
|
1999-12-15 02:25:50 +00:00
|
|
|
/*
|
|
|
|
|
* Test some fields in the header to see if they make sense.
|
|
|
|
|
*/
|
|
|
|
|
#define I4B_HDR_IS_OK(hdr) \
|
2019-09-02 21:23:33 +00:00
|
|
|
(!(hdr.length < sizeof(hdr) || \
|
|
|
|
|
hdr.length > 16384 || \
|
|
|
|
|
hdr.unit > 4 || \
|
|
|
|
|
hdr.type > TRC_CH_B2 || \
|
|
|
|
|
hdr.dir > FROM_NT || \
|
|
|
|
|
hdr.trunc > 2048 || \
|
|
|
|
|
hdr.ts_usec >= 1000000))
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Number of packets to try reading.
|
|
|
|
|
*/
|
|
|
|
|
#define PACKETS_TO_CHECK 5
|
1999-12-15 02:25:50 +00:00
|
|
|
|
2014-10-09 23:44:15 +00:00
|
|
|
wtap_open_return_val i4btrace_open(wtap *wth, int *err, gchar **err_info)
|
1999-12-12 22:40:10 +00:00
|
|
|
{
|
|
|
|
|
i4b_trace_hdr_t hdr;
|
1999-12-15 02:25:50 +00:00
|
|
|
gboolean byte_swapped = FALSE;
|
2010-02-26 07:59:54 +00:00
|
|
|
i4btrace_t *i4btrace;
|
1999-12-12 22:40:10 +00:00
|
|
|
|
|
|
|
|
/* I4B trace files have no magic in the header... Sigh */
|
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, &hdr, sizeof(hdr), 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;
|
1999-12-12 22:40:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Silly heuristic... */
|
1999-12-15 02:25:50 +00:00
|
|
|
if (!I4B_HDR_IS_OK(hdr)) {
|
|
|
|
|
/*
|
|
|
|
|
* OK, try byte-swapping the header fields.
|
|
|
|
|
*/
|
2019-09-02 21:23:33 +00:00
|
|
|
I4B_BYTESWAP_HEADER(hdr);
|
1999-12-15 02:25:50 +00:00
|
|
|
if (!I4B_HDR_IS_OK(hdr)) {
|
|
|
|
|
/*
|
|
|
|
|
* It doesn't look valid in either byte order.
|
|
|
|
|
*/
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_NOT_MINE;
|
1999-12-15 02:25:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* It looks valid byte-swapped, so assume it's a
|
|
|
|
|
* trace written in the opposite byte order.
|
|
|
|
|
*/
|
|
|
|
|
byte_swapped = TRUE;
|
|
|
|
|
}
|
1999-12-12 22:40:10 +00:00
|
|
|
|
2019-09-02 21:23:33 +00:00
|
|
|
/*
|
|
|
|
|
* Now try to read past the packet bytes; if that fails with
|
|
|
|
|
* a short read, we don't fail, so that we can report
|
|
|
|
|
* the file as a truncated I4B file.
|
|
|
|
|
*/
|
|
|
|
|
if (!wtap_read_bytes(wth->fh, NULL, hdr.length - (guint32)sizeof(hdr),
|
|
|
|
|
err, err_info)) {
|
|
|
|
|
if (*err != WTAP_ERR_SHORT_READ)
|
|
|
|
|
return WTAP_OPEN_ERROR;
|
2019-09-02 22:13:17 +00:00
|
|
|
} else {
|
2019-09-02 21:23:33 +00:00
|
|
|
/*
|
2019-09-02 22:13:17 +00:00
|
|
|
* Now try reading a few more packets.
|
2019-09-02 21:23:33 +00:00
|
|
|
*/
|
2019-09-02 22:13:17 +00:00
|
|
|
for (int i = 1; i < PACKETS_TO_CHECK; i++) {
|
2019-09-02 21:23:33 +00:00
|
|
|
/*
|
2019-09-02 22:13:17 +00:00
|
|
|
* Read and check the file header; we've already
|
|
|
|
|
* decided whether this would be a byte-swapped file
|
|
|
|
|
* or not, so we swap iff we decided it was.
|
2019-09-02 21:23:33 +00:00
|
|
|
*/
|
2019-09-02 22:13:17 +00:00
|
|
|
if (!wtap_read_bytes_or_eof(wth->fh, &hdr, sizeof(hdr), err,
|
|
|
|
|
err_info)) {
|
|
|
|
|
if (*err == 0) {
|
|
|
|
|
/* EOF; no more packets to try. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (*err != WTAP_ERR_SHORT_READ)
|
|
|
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
|
|
|
|
}
|
2019-09-02 21:23:33 +00:00
|
|
|
|
2019-09-02 22:13:17 +00:00
|
|
|
if (byte_swapped)
|
|
|
|
|
I4B_BYTESWAP_HEADER(hdr);
|
|
|
|
|
if (!I4B_HDR_IS_OK(hdr)) {
|
|
|
|
|
/*
|
|
|
|
|
* It doesn't look valid.
|
|
|
|
|
*/
|
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
|
|
|
|
}
|
2019-09-02 21:23:33 +00:00
|
|
|
|
|
|
|
|
/*
|
2019-09-02 22:13:17 +00:00
|
|
|
* Now try to read past the packet bytes; if that
|
|
|
|
|
* fails with a short read, we don't fail, so that
|
|
|
|
|
* we can report the file as a truncated I4B file.
|
2019-09-02 21:23:33 +00:00
|
|
|
*/
|
2019-09-02 22:13:17 +00:00
|
|
|
if (!wtap_read_bytes(wth->fh, NULL,
|
|
|
|
|
hdr.length - (guint32)sizeof(hdr), err, err_info)) {
|
|
|
|
|
if (*err != WTAP_ERR_SHORT_READ)
|
|
|
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Probably a truncated file, so just quit.
|
|
|
|
|
*/
|
|
|
|
|
break;
|
|
|
|
|
}
|
2019-09-02 21:23:33 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
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;
|
1999-12-12 22:40:10 +00:00
|
|
|
|
|
|
|
|
/* Get capture start time */
|
|
|
|
|
|
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 = i4btrace_file_type_subtype;
|
2020-12-21 02:30:28 +00:00
|
|
|
i4btrace = g_new(i4btrace_t, 1);
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->priv = (void *)i4btrace;
|
|
|
|
|
wth->subtype_read = i4btrace_read;
|
|
|
|
|
wth->subtype_seek_read = i4btrace_seek_read;
|
|
|
|
|
wth->snapshot_length = 0; /* not known */
|
1999-12-12 22:40:10 +00:00
|
|
|
|
2010-02-26 07:59:54 +00:00
|
|
|
i4btrace->byte_swapped = byte_swapped;
|
1999-12-12 22:40:10 +00:00
|
|
|
|
2014-05-09 05:18:49 +00:00
|
|
|
wth->file_encap = WTAP_ENCAP_ISDN;
|
2014-09-28 18:37:06 +00:00
|
|
|
wth->file_tsprec = WTAP_TSPREC_USEC;
|
1999-12-12 22:40:10 +00:00
|
|
|
|
2020-07-29 08:30:54 +00:00
|
|
|
/*
|
|
|
|
|
* Add an IDB; we don't know how many interfaces were
|
|
|
|
|
* involved, so we just say one interface, about which
|
|
|
|
|
* we only know the link-layer type, snapshot length,
|
|
|
|
|
* and time stamp resolution.
|
|
|
|
|
*/
|
|
|
|
|
wtap_add_generated_idb(wth);
|
|
|
|
|
|
2014-10-09 23:44:15 +00:00
|
|
|
return WTAP_OPEN_MINE;
|
1999-12-12 22:40:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Read the next packet */
|
2019-04-05 01:56:27 +00:00
|
|
|
static gboolean i4btrace_read(wtap *wth, wtap_rec *rec, Buffer *buf,
|
|
|
|
|
int *err, gchar **err_info, gint64 *data_offset)
|
1999-12-12 22:40:10 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
*data_offset = file_tell(wth->fh);
|
2013-05-17 06:08:40 +00:00
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
return i4b_read_rec(wth, wth->fh, rec, buf, err, err_info);
|
2000-05-18 09:09:50 +00:00
|
|
|
}
|
|
|
|
|
|
2014-05-23 10:50:02 +00:00
|
|
|
static gboolean
|
2018-02-09 00:19:12 +00:00
|
|
|
i4btrace_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec,
|
2014-01-02 20:47:21 +00:00
|
|
|
Buffer *buf, int *err, gchar **err_info)
|
2000-05-18 09:09:50 +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;
|
2000-05-18 09:09:50 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
if (!i4b_read_rec(wth, wth->random_fh, rec, buf, err, err_info)) {
|
2000-05-18 09:09:50 +00:00
|
|
|
/* Read error or EOF */
|
2013-06-17 21:18:47 +00:00
|
|
|
if (*err == 0) {
|
2002-03-05 05:58:41 +00:00
|
|
|
/* EOF means "short read" in random-access mode */
|
|
|
|
|
*err = WTAP_ERR_SHORT_READ;
|
|
|
|
|
}
|
2014-05-23 10:50:02 +00:00
|
|
|
return FALSE;
|
2000-05-18 09:09:50 +00:00
|
|
|
}
|
2014-05-23 10:50:02 +00:00
|
|
|
return TRUE;
|
2000-05-18 09:09:50 +00:00
|
|
|
}
|
|
|
|
|
|
2014-05-23 17:51:56 +00:00
|
|
|
static gboolean
|
2018-02-09 00:19:12 +00:00
|
|
|
i4b_read_rec(wtap *wth, FILE_T fh, wtap_rec *rec, Buffer *buf,
|
2013-05-17 06:08:40 +00:00
|
|
|
int *err, gchar **err_info)
|
2000-05-18 09:09:50 +00:00
|
|
|
{
|
2014-05-09 05:18:49 +00:00
|
|
|
i4btrace_t *i4btrace = (i4btrace_t *)wth->priv;
|
2013-05-17 06:08:40 +00:00
|
|
|
i4b_trace_hdr_t hdr;
|
|
|
|
|
guint32 length;
|
2000-05-18 09:09:50 +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_or_eof(fh, &hdr, sizeof hdr, err, err_info))
|
2013-06-17 21:18:47 +00:00
|
|
|
return FALSE;
|
2010-02-26 07:59:54 +00:00
|
|
|
|
|
|
|
|
if (i4btrace->byte_swapped) {
|
2000-05-18 09:09:50 +00:00
|
|
|
/*
|
|
|
|
|
* Byte-swap the header.
|
|
|
|
|
*/
|
2019-09-02 21:23:33 +00:00
|
|
|
I4B_BYTESWAP_HEADER(hdr);
|
2000-05-18 09:09:50 +00:00
|
|
|
}
|
|
|
|
|
|
2013-05-17 06:08:40 +00:00
|
|
|
if (hdr.length < sizeof(hdr)) {
|
|
|
|
|
*err = WTAP_ERR_BAD_FILE; /* record length < header! */
|
|
|
|
|
*err_info = g_strdup_printf("i4btrace: record length %u < header length %lu",
|
|
|
|
|
hdr.length, (unsigned long)sizeof(hdr));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
length = hdr.length - (guint32)sizeof(hdr);
|
Allow bigger snapshot lengths for D-Bus captures.
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except
for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for
them, because that's the largest possible D-Bus message size. See
https://bugs.freedesktop.org/show_bug.cgi?id=100220
for an example of the problems caused by limiting the snapshot length to
256KB for D-Bus.
Have a snapshot length of 0 in a capture_file structure mean "there is
no snapshot length for the file"; we don't need the has_snap field in
that case, a value of 0 mean "no, we don't have a snapshot length".
In dumpcap, start out with a pipe buffer size of 2KB, and grow it as
necessary. When checking for a too-big packet from a pipe, check
against the appropriate maximum - 128MB for DLT_DBUS, 256KB for
everything else.
Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20
Reviewed-on: https://code.wireshark.org/review/21952
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-05 01:58:40 +00:00
|
|
|
if (length > WTAP_MAX_PACKET_SIZE_STANDARD) {
|
2013-05-17 06:08:40 +00:00
|
|
|
/*
|
|
|
|
|
* Probably a corrupt capture file; don't blow up trying
|
|
|
|
|
* to allocate space for an immensely-large packet.
|
|
|
|
|
*/
|
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
|
*err_info = g_strdup_printf("i4btrace: File has %u-byte packet, bigger than maximum of %u",
|
Allow bigger snapshot lengths for D-Bus captures.
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except
for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for
them, because that's the largest possible D-Bus message size. See
https://bugs.freedesktop.org/show_bug.cgi?id=100220
for an example of the problems caused by limiting the snapshot length to
256KB for D-Bus.
Have a snapshot length of 0 in a capture_file structure mean "there is
no snapshot length for the file"; we don't need the has_snap field in
that case, a value of 0 mean "no, we don't have a snapshot length".
In dumpcap, start out with a pipe buffer size of 2KB, and grow it as
necessary. When checking for a too-big packet from a pipe, check
against the appropriate maximum - 128MB for DLT_DBUS, 256KB for
everything else.
Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20
Reviewed-on: https://code.wireshark.org/review/21952
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-05 01:58:40 +00:00
|
|
|
length, WTAP_MAX_PACKET_SIZE_STANDARD);
|
2002-03-05 08:40:27 +00:00
|
|
|
return FALSE;
|
2000-05-18 09:09:50 +00:00
|
|
|
}
|
2000-11-11 06:36:09 +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);
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->presence_flags = WTAP_HAS_TS;
|
2013-05-17 06:08:40 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.len = length;
|
|
|
|
|
rec->rec_header.packet_header.caplen = length;
|
2013-05-17 06:08:40 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->ts.secs = hdr.ts_sec;
|
|
|
|
|
rec->ts.nsecs = hdr.ts_usec * 1000;
|
2013-05-17 06:08:40 +00:00
|
|
|
|
|
|
|
|
switch (hdr.type) {
|
|
|
|
|
|
|
|
|
|
case TRC_CH_I:
|
|
|
|
|
/*
|
|
|
|
|
* XXX - what is it? It's probably not WTAP_ENCAP_NULL,
|
|
|
|
|
* as that means it has a 4-byte AF_ type as the
|
|
|
|
|
* encapsulation header.
|
|
|
|
|
*/
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.pkt_encap = WTAP_ENCAP_NULL;
|
2013-05-17 06:08:40 +00:00
|
|
|
break;
|
2000-11-11 06:36:09 +00:00
|
|
|
|
|
|
|
|
case TRC_CH_D:
|
|
|
|
|
/*
|
|
|
|
|
* D channel, so it's LAPD; set "p2p.sent".
|
|
|
|
|
*/
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.pkt_encap = WTAP_ENCAP_ISDN;
|
|
|
|
|
rec->rec_header.packet_header.pseudo_header.isdn.channel = 0;
|
2000-11-11 06:36:09 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TRC_CH_B1:
|
|
|
|
|
/*
|
2002-10-31 07:12:42 +00:00
|
|
|
* B channel 1.
|
2000-11-11 06:36:09 +00:00
|
|
|
*/
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.pkt_encap = WTAP_ENCAP_ISDN;
|
|
|
|
|
rec->rec_header.packet_header.pseudo_header.isdn.channel = 1;
|
2002-10-31 07:12:42 +00:00
|
|
|
break;
|
2000-11-11 06:36:09 +00:00
|
|
|
|
2002-10-31 07:12:42 +00:00
|
|
|
case TRC_CH_B2:
|
|
|
|
|
/*
|
|
|
|
|
* B channel 2.
|
|
|
|
|
*/
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.pkt_encap = WTAP_ENCAP_ISDN;
|
|
|
|
|
rec->rec_header.packet_header.pseudo_header.isdn.channel = 2;
|
2000-11-11 06:36:09 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2013-05-17 06:08:40 +00:00
|
|
|
|
2018-02-09 00:19:12 +00:00
|
|
|
rec->rec_header.packet_header.pseudo_header.isdn.uton = (hdr.dir == FROM_TE);
|
2013-05-17 06:08:40 +00:00
|
|
|
|
2013-06-17 21:18:47 +00:00
|
|
|
/*
|
|
|
|
|
* Read the packet data.
|
|
|
|
|
*/
|
|
|
|
|
return wtap_read_packet_bytes(fh, buf, length, err, err_info);
|
2013-05-17 06:08:40 +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 i4btrace_blocks_supported[] = {
|
|
|
|
|
/*
|
|
|
|
|
* We support packet blocks, with no comments or other options.
|
|
|
|
|
*/
|
|
|
|
|
{ WTAP_BLOCK_PACKET, MULTIPLE_BLOCKS_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 i4btrace_info = {
|
|
|
|
|
"I4B ISDN trace", "i4btrace", NULL, NULL,
|
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(i4btrace_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_i4btrace(void)
|
|
|
|
|
{
|
2021-02-24 03:10:35 +00:00
|
|
|
i4btrace_file_type_subtype = wtap_register_file_type_subtype(&i4btrace_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("I4BTRACE",
|
|
|
|
|
i4btrace_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:
|
|
|
|
|
*/
|