osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wiretap: eliminate two WTAP_FILE_TYPE_SUBTYPE_ values. 

Eliminate WTAP_FILE_TYPE_SUBTYPE_ERF and
WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL - instead, fetch the values by
name, using wtap_name_to_file_type_subtype().

This requires that wtap_init() be called before epan_init(); that's
currently the case, but put in comments to indicate why it must continue
to be the case.
This commit is contained in:
Guy Harris 2021-02-19 14:46:42 -08:00
parent abf9e027fc
commit c80c16759b
13 changed files with 103 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dftest.c
View File

@ -71,6 +71,11 @@ main(int argc, char **argv)
timestamp_set_type(TS_RELATIVE);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
/*
* Libwiretap must be initialized before libwireshark is, so that
* dissection-time handlers for file-type-dependent blocks can
* register using the file type/subtype value for the file type.
*/
wtap_init(TRUE);
/* Register all dissectors; we must do this before checking for the

6
epan/dissectors/packet-erf.c
View File

@ -3863,9 +3863,13 @@ proto_register_erf(void)
void
proto_reg_handoff_erf(void)
{
int file_type_subtype_erf;
dissector_add_uint("wtap_encap", WTAP_ENCAP_ERF, erf_handle);
/* Also register dissector for Provenance non-packet records */
dissector_add_uint("wtap_fts_rec", WTAP_FILE_TYPE_SUBTYPE_ERF, erf_handle);
file_type_subtype_erf = wtap_name_to_file_type_subtype("erf");
if (file_type_subtype_erf != -1)
dissector_add_uint("wtap_fts_rec", file_type_subtype_erf, erf_handle);
/* Get handles for serial line protocols */
chdlc_handle = find_dissector_add_dependency("chdlc", proto_erf);

6
epan/dissectors/packet-systemd-journal.c
View File

@ -889,7 +889,11 @@ proto_register_systemd_journal(void)
void
proto_reg_handoff_systemd_journal(void)
{
dissector_add_uint("wtap_fts_rec", WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL, sje_handle);
int file_type_subtype_systemd_journal;
file_type_subtype_systemd_journal = wtap_name_to_file_type_subtype("systemd_journal");
if (file_type_subtype_systemd_journal != -1)
dissector_add_uint("wtap_fts_rec", file_type_subtype_systemd_journal, sje_handle);
dissector_add_uint("pcapng.block_type", BLOCK_TYPE_SYSTEMD_JOURNAL, sje_handle);
// It's possible to ship journal entries over HTTP/HTTPS using
// systemd-journal-remote. Dissecting them on the wire isn't very

5
fuzz/fuzzshark.c
View File

@ -280,6 +280,11 @@ fuzz_init(int argc _U_, char **argv)
timestamp_set_precision(TS_PREC_AUTO);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
/*
* Libwiretap must be initialized before libwireshark is, so that
* dissection-time handlers for file-type-dependent blocks can
* register using the file type/subtype value for the file type.
*/
wtap_init(TRUE);
/* Register all dissectors; we must do this before checking for the

10
rawshark.c
View File

@ -509,6 +509,16 @@ main(int argc, char *argv[])
timestamp_set_precision(TS_PREC_AUTO);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
/*
* XXX - is this necessary, given that we're not reading a
* regular capture file, we're reading rawshark's packet
* stream format?
*
* If it is, note that libwiretap must be initialized before
* libwireshark is, so that dissection-time handlers for
* file-type-dependent blocks can register using the file
* type/subtype value for the file type.
*/
wtap_init(FALSE);
/* Register all dissectors; we must do this before checking for the

5
sharkd.c
View File

@ -148,6 +148,11 @@ main(int argc, char *argv[])
timestamp_set_precision(TS_PREC_AUTO);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
/*
* Libwiretap must be initialized before libwireshark is, so that
* dissection-time handlers for file-type-dependent blocks can
* register using the file type/subtype value for the file type.
*/
wtap_init(TRUE);
/* Register all dissectors; we must do this before checking for the

12
tfshark.c
View File

@ -479,6 +479,18 @@ main(int argc, char *argv[])
timestamp_set_precision(TS_PREC_AUTO);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
/*
* Libwiretap must be initialized before libwireshark is, so that
* dissection-time handlers for file-type-dependent blocks can
* register using the file type/subtype value for the file type.
*
* XXX - TFShark shouldn't use libwiretap, as it's a file dissector
* and should read all files as raw bytes and then try to dissect them.
* It needs to handle file types its own way, because we would want
* to support dissecting file-type-specific blocks when dissecting
* capture files, but that mechanism should support plugins for
* other files, too, if *their* formats are extensible.
*/
wtap_init(TRUE);
/* Register all dissectors; we must do this before checking for the

5
tshark.c
View File

@ -949,6 +949,11 @@ main(int argc, char *argv[])
timestamp_set_precision(TS_PREC_AUTO);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
/*
* Libwiretap must be initialized before libwireshark is, so that
* dissection-time handlers for file-type-dependent blocks can
* register using the file type/subtype value for the file type.
*/
wtap_init(TRUE);
/* Register all dissectors; we must do this before checking for the

5
ui/qt/main.cpp
View File

@ -732,6 +732,11 @@ int main(int argc, char *qt_argv[])
open_failure_alert_box, read_failure_alert_box,
write_failure_alert_box);
/*
* Libwiretap must be initialized before libwireshark is, so that
* dissection-time handlers for file-type-dependent blocks can
* register using the file type/subtype value for the file type.
*/
wtap_init(TRUE);
splash_update(RA_DISSECTORS, NULL, NULL);

25
wiretap/erf.c
View File

@ -177,6 +177,10 @@ static gboolean erf_wtap_blocks_to_erf_sections(wtap_block_t block, GPtrArray *s
static guint32 erf_meta_read_tag(struct erf_meta_tag*, guint8*, guint32);
static int erf_file_type_subtype = -1;
void register_erf(void);
static guint erf_anchor_mapping_hash(gconstpointer key) {
const struct erf_anchor_mapping *anchor_map = (const struct erf_anchor_mapping*) key;
@ -542,7 +546,7 @@ extern wtap_open_return_val erf_open(wtap *wth, int *err, gchar **err_info)
}
/* This is an ERF file */
wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_ERF;
wth->file_type_subtype = erf_file_type_subtype;
wth->snapshot_length = 0; /* not available in header, only in frame */
/*
@ -707,7 +711,7 @@ static gboolean erf_read_header(wtap *wth, FILE_T fh,
{
guint64 ts = pletoh64(&erf_header->ts);
/*if ((erf_header->type & 0x7f) != ERF_TYPE_META || wth->file_type_subtype != WTAP_FILE_TYPE_SUBTYPE_ERF) {*/
/*if ((erf_header->type & 0x7f) != ERF_TYPE_META || wth->file_type_subtype != file_type_subtype_erf) {*/
rec->rec_type = REC_TYPE_PACKET;
/*
* XXX: ERF_TYPE_META records should ideally be FT_SPECIFIC for display
@ -3391,6 +3395,23 @@ static void erf_close(wtap *wth)
wth->priv = NULL;
}
static const struct file_type_subtype_info erf_info = {
"Endace ERF capture", "erf", "erf", NULL,
FALSE, TRUE, WTAP_COMMENT_PER_SECTION|WTAP_COMMENT_PER_INTERFACE|WTAP_COMMENT_PER_PACKET,
erf_dump_can_write_encap, erf_dump_open, NULL
};
void register_erf(void)
{
erf_file_type_subtype = wtap_register_file_type_subtypes(&erf_info);
/*
* Register name for backwards compatibility with the
* wtap_filetypes table in Lua.
*/
wtap_register_backwards_compatibility_lua_name("ERF", erf_file_type_subtype);
}
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*

14
wiretap/file_access.c
View File

@ -1285,16 +1285,6 @@ static const struct file_type_subtype_info file_type_subtype_table_base[] = {
{ "ASN.1 Basic Encoding Rules", "ber", NULL, NULL,
FALSE, FALSE, 0,
NULL, NULL, NULL },
/* WTAP_FILE_TYPE_SUBTYPE_ERF */
{ "Endace ERF capture", "erf", "erf", NULL,
FALSE, TRUE, WTAP_COMMENT_PER_SECTION|WTAP_COMMENT_PER_INTERFACE|WTAP_COMMENT_PER_PACKET,
erf_dump_can_write_encap, erf_dump_open, NULL },
/* WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL */
{ "systemd journal export", "systemd_journal", NULL, NULL,
FALSE, FALSE, 0,
NULL, NULL, NULL }
};
#define N_DUMP_OPEN_TABLE_BASE_ENTRIES (sizeof(file_type_subtype_table_base) / sizeof(struct file_type_subtype_info))
@ -2841,10 +2831,6 @@ wtap_register_backwards_compatibility_lua_name(const char *name, int ft)
WTAP_FILE_TYPE_SUBTYPE_IPTRACE_2_0);
wtap_register_backwards_compatibility_lua_name("BER",
WTAP_FILE_TYPE_SUBTYPE_BER);
wtap_register_backwards_compatibility_lua_name("ERF",
WTAP_FILE_TYPE_SUBTYPE_ERF);
wtap_register_backwards_compatibility_lua_name("SYSTEMD_JOURNAL",
WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL);
}
entry.name = name;
entry.ft = ft;

24
wiretap/systemd_journal.c
View File

@ -62,6 +62,10 @@ static gboolean systemd_journal_read_export_entry(FILE_T fh, wtap_rec *rec,
#define FLD__REALTIME_TIMESTAMP "__REALTIME_TIMESTAMP="
#define FLD__MONOTONIC_TIMESTAMP "__MONOTONIC_TIMESTAMP="
static int systemd_journal_file_type_subtype = -1;
void register_systemd_journal(void);
wtap_open_return_val systemd_journal_open(wtap *wth, int *err _U_, gchar **err_info _U_)
{
gchar *entry_buff = (gchar*) g_malloc(MAX_EXPORT_ENTRY_LENGTH);
@ -97,7 +101,7 @@ wtap_open_return_val systemd_journal_open(wtap *wth, int *err _U_, gchar **err_i
return WTAP_OPEN_NOT_MINE;
}
wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL;
wth->file_type_subtype = systemd_journal_file_type_subtype;
wth->subtype_read = systemd_journal_read;
wth->subtype_seek_read = systemd_journal_seek_read;
wth->file_encap = WTAP_ENCAP_SYSTEMD_JOURNAL;
@ -232,6 +236,24 @@ systemd_journal_read_export_entry(FILE_T fh, wtap_rec *rec, Buffer *buf, int *er
return TRUE;
}
static const struct file_type_subtype_info systemd_journal_info = {
"systemd journal export", "systemd_journal", NULL, NULL,
FALSE, FALSE, 0,
NULL, NULL, NULL
};
void register_systemd_journal(void)
{
systemd_journal_file_type_subtype = wtap_register_file_type_subtypes(&systemd_journal_info);
/*
* Register name for backwards compatibility with the
* wtap_filetypes table in Lua.
*/
wtap_register_backwards_compatibility_lua_name("SYSTEMD_JOURNAL",
systemd_journal_file_type_subtype);
}
/*
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*

2
wiretap/wtap.h
View File

@ -312,8 +312,6 @@ extern "C" {
#define WTAP_FILE_TYPE_SUBTYPE_IPTRACE_1_0 9
#define WTAP_FILE_TYPE_SUBTYPE_IPTRACE_2_0 10
#define WTAP_FILE_TYPE_SUBTYPE_BER 11
#define WTAP_FILE_TYPE_SUBTYPE_ERF 12
#define WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL 13
/* timestamp precision (currently only these values are supported) */
#define WTAP_TSPREC_UNKNOWN -2