URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=08d49ff2e06cb35dc9084735aa60c83686afdd9c
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
08d49ff by Michael Mann (mmann78@xxxxxxxxxxxx):
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@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Actions performed:
from 37acf43 wmem: add null-terminator support.
adds 08d49ff Making wiretap option blocks more generic.
Summary of changes:
capinfos.c | 19 +-
cfile.c | 16 +-
debian/libwiretap0.symbols | 13 +-
editcap.c | 26 +-
epan/wslua/wslua.h | 21 ++
epan/wslua/wslua_capture_info.c | 25 +-
file.c | 8 +-
reordercap.c | 17 +-
summary.c | 47 +--
tshark.c | 28 +-
ui/gtk/file_import_dlg.c | 56 ++--
ui/tap_export_pdu.c | 57 ++--
wiretap/CMakeLists.txt | 1 +
wiretap/Makefile.common | 4 +-
wiretap/erf.c | 64 ++--
wiretap/file_access.c | 109 +++----
wiretap/lanalyzer.c | 3 +-
wiretap/merge.c | 201 +++++++-----
wiretap/nettrace_3gpp_32_423.c | 65 ++--
wiretap/pcapng.c | 665 +++++++++++++++++++--------------------
wiretap/pcapng.h | 89 +++++-
wiretap/wtap-int.h | 10 +-
wiretap/wtap.c | 217 +++++--------
wiretap/wtap.h | 216 ++-----------
wiretap/wtap_opttypes.c | 505 +++++++++++++++++++++++++++++
wiretap/wtap_opttypes.h | 250 +++++++++++++++
26 files changed, 1713 insertions(+), 1019 deletions(-)
create mode 100644 wiretap/wtap_opttypes.c
create mode 100644 wiretap/wtap_opttypes.h