diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-01-25 20:17:21 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-23 00:39:38 +0000 |
| commit | 08d49ff2e06cb35dc9084735aa60c83686afdd9c (patch) | |
| tree | 93d55773a42d4a1cf64b6544c6e2f3ec03ef4f4e /file.c | |
| parent | 37acf433dbb2ef1d443c9ee09a315b0b4ce136d8 (diff) | |
Making wiretap option blocks more generic.
This was inspired by https://code.wireshark.org/review/9729/, but takes it in a different direction where all options are put into an array, regardless of whether they are "standard" or "custom". It should be easier to add "custom" options in this design. Some, but not all blocks have been converted.
Descriptions of some of the block options have been moved from wtap.h to pcapng.h as it seems to be the one that implements the description of the blocks.
Also what could be added/refactored is registering block behavior.
Change-Id: I3dffa38f0bb088f98749a4f97a3b7655baa4aa6a
Reviewed-on: https://code.wireshark.org/review/13667
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4475,9 +4475,9 @@ cf_save_records(capture_file *cf, const char *fname, guint save_format, or moving the capture file, we have to do it by writing the packets out in Wiretap. */ - wtapng_section_t *shb_hdr = NULL; + wtap_optionblock_t shb_hdr = NULL; wtapng_iface_descriptions_t *idb_inf = NULL; - wtapng_name_res_t *nrb_hdr = NULL; + wtap_optionblock_t nrb_hdr = NULL; int encap; /* XXX: what free's this shb_hdr? */ @@ -4698,9 +4698,9 @@ cf_export_specified_packets(capture_file *cf, const char *fname, int err; wtap_dumper *pdh; save_callback_args_t callback_args; - wtapng_section_t *shb_hdr = NULL; + wtap_optionblock_t shb_hdr = NULL; wtapng_iface_descriptions_t *idb_inf = NULL; - wtapng_name_res_t *nrb_hdr = NULL; + wtap_optionblock_t nrb_hdr = NULL; int encap; cf_callback_invoke(cf_cb_file_export_specified_packets_started, (gpointer)fname); |