diff options
author | Guy Harris <gharris@sonic.net> | 2021-02-14 00:34:10 -0800 |
---|---|---|
committer | Guy Harris <gharris@sonic.net> | 2021-02-14 00:58:46 -0800 |
commit | b8b3531883db249be80e217154c7e7fffb86f5bd (patch) | |
tree | becde2c028097baae1b38d8c13b4a9827d0de8b0 /wiretap/json.c | |
parent | 5b3c3d0682c869e6dd19a5245b1a22c90192e9ae (diff) |
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.
Diffstat (limited to 'wiretap/json.c')
-rw-r--r-- | wiretap/json.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/wiretap/json.c b/wiretap/json.c index 1cfdc0692d..589fc06e20 100644 --- a/wiretap/json.c +++ b/wiretap/json.c @@ -18,6 +18,10 @@ /* Maximum size of json file. */ #define MAX_FILE_SIZE (50*1024*1024) +static int json_file_type_subtype = -1; + +void register_json(void); + wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info) { guint8* filebuf; @@ -52,7 +56,7 @@ wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info) return WTAP_OPEN_ERROR; } - wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_JSON; + wth->file_type_subtype = json_file_type_subtype; wth->file_encap = WTAP_ENCAP_JSON; wth->file_tsprec = WTAP_TSPREC_SEC; wth->subtype_read = wtap_full_file_read; @@ -63,6 +67,19 @@ wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info) return WTAP_OPEN_MINE; } +static const struct file_type_subtype_info json_info = { + /* WTAP_FILE_TYPE_SUBTYPE_JSON */ + "JavaScript Object Notation", "json", "json", NULL, + FALSE, FALSE, 0, + NULL, NULL, NULL +}; + +void register_json(void) +{ + json_file_type_subtype = wtap_register_file_type_subtypes(&json_info, + WTAP_FILE_TYPE_SUBTYPE_UNKNOWN); +} + /* * Editor modelines - https://www.wireshark.org/tools/modelines.html * |