Wireshark-commits: [Wireshark-commits] master-3.2 95c6c44: MIME/pcapng: use snap length to get SPB
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=95c6c4431799867ec10ea5e34500a1e0858cf8ba
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark
Commits:
95c6c44 by David Perry (boolean263@xxxxxxxxxxxxxx):
MIME/pcapng: use snap length to get SPB data length
The "Original Packet Length" field of a Simple Packet Block can be
greater than the amount of data actually captured; the Interface
Description Block's snap length must be checked as well.
To enable this in the MIME Files Format dissector, the
`interface_description` needs to store the snap length. This allows the
appropriate section of `dissect_block()` to access it via the `info`
parameter.
The "Captured Length" field from EPB/PB dissection is added to SPB
dissection as a generated field to clarify the difference between it and
the field labelled "Packet Length".
Bug: 16526
Change-Id: I27f2fccc9ed2f682377059931b18d7e42d7ff0a3
Reviewed-on: https://code.wireshark.org/review/37095
Petri-Dish: Guy Harris <gharris@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
(cherry picked from commit 5b238a6c76634712c09e355c7945721a3a0ae8f1)
Reviewed-on: https://code.wireshark.org/review/37124
Actions performed:
from d309f25 MIME/pcapng: reset interface array on new SHB
add 95c6c44 MIME/pcapng: use snap length to get SPB data length
Summary of changes:
epan/dissectors/file-pcapng.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)