URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b8121932e9be9d61e3dff8f608d1d438dd163f27
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
b812193 by Guy Harris (guy@xxxxxxxxxxxx):
Have block read routines indicate whether the block should be returned.
Some blocks should be returned by wtap_read(), others are just processed
internally. Add a Boolean flag to wtapng_block_t, have the routines
that read particular block types set it appropriately, and have the read
and seek-read routines check that flag rather than checking for the
block types that should be returned. Pass a pointer to the
wtapng_block_t to packet type plugin read routines, rather than passing
it some members of the wtapng_block_t.
This means that 1) for new block types, we don't have to update any
tests and 2) plugin handlers for block types can indicate whether they
processed the block internally and the caller shouldn't see it or 2) the
block should be provided to the caller.
Bug: 14388
Change-Id: Iccc2031a277f55c7fa8b4f692c776b482b792b4f
Reviewed-on: https://code.wireshark.org/review/25609
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 8556f65 pcapng_read_block() should just return a Boolean.
adds b812193 Have block read routines indicate whether the block should be returned.
Summary of changes:
wiretap/pcapng.c | 98 ++++++++++++++++++++++++++++++-------------------
wiretap/pcapng_module.h | 22 ++++++++++-
2 files changed, 81 insertions(+), 39 deletions(-)