2018-05-03 14:10:15 +00:00
|
|
|
/* dpa400.c
|
|
|
|
*
|
|
|
|
* Unigraf DisplayPort AUX channel monitor output parser
|
|
|
|
* Copyright 2018, Dirk Eibach, Guntermann & Drunck GmbH <dirk.eibach@gdsys.cc>
|
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "wtap-int.h"
|
|
|
|
#include "file_wrappers.h"
|
2018-05-17 06:05:12 +00:00
|
|
|
#include "dpa400.h"
|
2018-05-03 14:10:15 +00:00
|
|
|
|
|
|
|
enum {
|
|
|
|
DPA400_DATA = 0x00,
|
|
|
|
DPA400_DATA_END = 0x01,
|
|
|
|
DPA400_EVENT = 0x02,
|
|
|
|
DPA400_START = 0x03,
|
|
|
|
DPA400_STOP = 0x04,
|
|
|
|
DPA400_TS_OVERFLOW = 0x84,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct dpa400_header {
|
|
|
|
guint8 t0;
|
|
|
|
guint8 sb0;
|
|
|
|
guint8 t1;
|
|
|
|
guint8 sb1;
|
|
|
|
guint8 t2;
|
|
|
|
guint8 sb2;
|
|
|
|
};
|
|
|
|
|
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 dpa400_file_type_subtype = -1;
|
|
|
|
|
|
|
|
void register_dpa400(void);
|
|
|
|
|
2018-05-03 14:10:15 +00:00
|
|
|
static gboolean dpa400_read_header(FILE_T fh, struct dpa400_header *hdr, int *err, gchar **err_info)
|
|
|
|
{
|
|
|
|
if (!wtap_read_bytes_or_eof(fh, hdr, sizeof(struct dpa400_header), err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (hdr->sb0 || hdr->sb1 || hdr->sb2) {
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup("dpa400: malformed packet header");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_ts(struct dpa400_header *hdr, nstime_t *ts)
|
|
|
|
{
|
|
|
|
guint32 val;
|
|
|
|
|
|
|
|
val = (hdr->t0 | (hdr->t1 << 8) | ((hdr->t2 & 0x7f) << 16)) << 5;
|
|
|
|
|
|
|
|
ts->secs = val / 1000000;
|
|
|
|
ts->nsecs = (val % 1000000) * 1000;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_ts_overflow(nstime_t *ts)
|
|
|
|
{
|
|
|
|
guint32 val = 0x7fffff << 5;
|
|
|
|
|
|
|
|
ts->secs = val / 1000000;
|
|
|
|
ts->nsecs = (val % 1000000) * 1000;
|
|
|
|
}
|
|
|
|
|
|
|
|
static guint8 get_from(struct dpa400_header *hdr)
|
|
|
|
{
|
|
|
|
return hdr->t2 & 0x80;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean dpa400_read_packet(wtap *wth, FILE_T fh, wtap_rec *rec,
|
|
|
|
Buffer *buf, int *err, gchar **err_info)
|
|
|
|
{
|
|
|
|
guint8 chunk[2];
|
|
|
|
guint32 ctr = 0;
|
|
|
|
|
|
|
|
if (!wth || !rec || !buf)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (!wtap_read_bytes_or_eof(fh, chunk, sizeof(chunk), err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (chunk[1] != 1) {
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup("dpa400: malformed packet framing");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ws_buffer_clean(buf);
|
|
|
|
|
|
|
|
ws_buffer_append(buf, &chunk[0], 1);
|
|
|
|
ctr++;
|
|
|
|
|
|
|
|
switch (chunk[0]) {
|
|
|
|
case DPA400_STOP: {
|
|
|
|
struct dpa400_header hdr;
|
|
|
|
|
|
|
|
if (!dpa400_read_header(fh, &hdr, err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
get_ts(&hdr, &rec->ts);
|
|
|
|
|
|
|
|
rec->rec_type = REC_TYPE_PACKET;
|
2021-08-30 02:12:13 +00:00
|
|
|
rec->block = wtap_block_create(WTAP_BLOCK_PACKET);
|
2018-05-03 14:10:15 +00:00
|
|
|
rec->presence_flags = WTAP_HAS_TS;
|
|
|
|
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = 0;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case DPA400_START:
|
|
|
|
case DPA400_EVENT: {
|
|
|
|
struct dpa400_header hdr;
|
|
|
|
|
|
|
|
if (!dpa400_read_header(fh, &hdr, err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
get_ts(&hdr, &rec->ts);
|
|
|
|
|
|
|
|
if (!wtap_read_bytes_or_eof(fh, chunk, sizeof(chunk), err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (chunk[1]) {
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
|
|
|
*err_info = g_strdup("dpa400: malformed packet");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ws_buffer_append(buf, &chunk[0], 1);
|
|
|
|
ctr++;
|
|
|
|
|
|
|
|
rec->rec_type = REC_TYPE_PACKET;
|
2021-08-30 02:12:13 +00:00
|
|
|
rec->block = wtap_block_create(WTAP_BLOCK_PACKET);
|
2018-05-03 14:10:15 +00:00
|
|
|
rec->presence_flags = WTAP_HAS_TS;
|
|
|
|
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = ctr;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case DPA400_DATA: {
|
|
|
|
struct dpa400_header hdr;
|
|
|
|
guint8 from_source;
|
|
|
|
|
|
|
|
if (!dpa400_read_header(fh, &hdr, err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
get_ts(&hdr, &rec->ts);
|
|
|
|
|
|
|
|
from_source = !get_from(&hdr);
|
|
|
|
ws_buffer_append(buf, &from_source, 1);
|
2018-05-25 19:14:52 +00:00
|
|
|
ctr++;
|
2018-05-03 14:10:15 +00:00
|
|
|
|
|
|
|
while (1) {
|
|
|
|
if (!wtap_read_bytes_or_eof(fh, chunk, sizeof(chunk), err, err_info))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (chunk[1])
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (++ctr > WTAP_MAX_PACKET_SIZE_STANDARD) {
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
2021-12-18 18:48:20 +00:00
|
|
|
*err_info = ws_strdup_printf("dpa400: File has data record bigger than maximum of %u",
|
2018-05-03 14:10:15 +00:00
|
|
|
WTAP_MAX_PACKET_SIZE_STANDARD);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ws_buffer_append(buf, &chunk[0], 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
rec->rec_type = REC_TYPE_PACKET;
|
2021-08-30 02:12:13 +00:00
|
|
|
rec->block = wtap_block_create(WTAP_BLOCK_PACKET);
|
2018-05-03 14:10:15 +00:00
|
|
|
rec->presence_flags = WTAP_HAS_TS;
|
|
|
|
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = ctr;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case DPA400_TS_OVERFLOW: {
|
|
|
|
get_ts_overflow(&rec->ts);
|
|
|
|
|
|
|
|
rec->rec_type = REC_TYPE_PACKET;
|
2021-08-30 02:12:13 +00:00
|
|
|
rec->block = wtap_block_create(WTAP_BLOCK_PACKET);
|
2018-05-03 14:10:15 +00:00
|
|
|
rec->presence_flags = WTAP_HAS_TS;
|
|
|
|
rec->rec_header.packet_header.caplen = rec->rec_header.packet_header.len = ctr;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
*err = WTAP_ERR_BAD_FILE;
|
2021-12-18 18:48:20 +00:00
|
|
|
*err_info = ws_strdup_printf("dpa400: unknown packet type %02x", chunk[0]);
|
2018-05-03 14:10:15 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
static gboolean dpa400_seek_read(wtap *wth,gint64 seek_off, wtap_rec *rec, Buffer *buf,
|
2018-05-03 14:10:15 +00:00
|
|
|
int *err, gchar **err_info)
|
|
|
|
{
|
|
|
|
if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
return dpa400_read_packet(wth, wth->random_fh, rec, buf, err, err_info);
|
|
|
|
}
|
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
static gboolean dpa400_read(wtap *wth, wtap_rec *rec, Buffer *buf,
|
|
|
|
int *err, gchar **err_info, gint64 *data_offset)
|
2018-05-03 14:10:15 +00:00
|
|
|
{
|
|
|
|
*data_offset = file_tell(wth->fh);
|
|
|
|
|
2019-04-05 01:56:27 +00:00
|
|
|
return dpa400_read_packet(wth, wth->fh, rec, buf, err, err_info);
|
2018-05-03 14:10:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
wtap_open_return_val dpa400_open(wtap *wth, int *err, gchar **err_info)
|
|
|
|
{
|
|
|
|
char magic[4];
|
|
|
|
const char dpa_magic[] = { 'D', 'B', 'F', 'R' };
|
|
|
|
|
|
|
|
/* Read in the number that should be at the start of a "dpa-400" file */
|
|
|
|
if (!wtap_read_bytes(wth->fh, &magic, sizeof magic, err, err_info)) {
|
|
|
|
if (*err != WTAP_ERR_SHORT_READ)
|
|
|
|
return WTAP_OPEN_ERROR;
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (memcmp(magic, dpa_magic, sizeof(dpa_magic)))
|
|
|
|
return WTAP_OPEN_NOT_MINE;
|
|
|
|
|
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 = dpa400_file_type_subtype;
|
2018-05-03 14:10:15 +00:00
|
|
|
wth->file_encap = WTAP_ENCAP_DPAUXMON;
|
|
|
|
wth->file_tsprec = WTAP_TSPREC_USEC;
|
|
|
|
wth->subtype_read = dpa400_read;
|
|
|
|
wth->subtype_seek_read = dpa400_seek_read;
|
|
|
|
wth->snapshot_length = 0;
|
|
|
|
|
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);
|
|
|
|
|
2018-05-03 14:10:15 +00:00
|
|
|
return WTAP_OPEN_MINE;
|
|
|
|
}
|
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
|
|
|
|
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 dpa400_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 dpa400_info = {
|
|
|
|
"Unigraf DPA-400 capture", "dpa400", "bin", 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(dpa400_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_dpa400(void)
|
|
|
|
{
|
2021-02-24 03:10:35 +00:00
|
|
|
dpa400_file_type_subtype = wtap_register_file_type_subtype(&dpa400_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("DPA400",
|
|
|
|
dpa400_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
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
|
|
|
*
|
|
|
|
* 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:
|
|
|
|
*/
|