Wireshark-commits: [Wireshark-commits] master-3.0 46d04be: Add macros for the pack_flags field.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=46d04be356a18100536c93a7455d742514d541ee
Submitter: "Dario Lombardo <lomato@xxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark
Commits:
46d04be by Guy Harris (guy@xxxxxxxxxxxx):
Add macros for the pack_flags field.
Add macros to extract the direction, reception type, and FCS length
fields of the pack_flags field, and add definitions for different
directions and reception types.
Add a macro to construct a pack_flags field value from subfields; this
is for use by non-pcapng file readers (the pack_flags field is just a
copy of the EPB flags option, so that's not needed for pcapng).
Move some #defines for that field from packet-frame.c to wtap.h, and
rename them to match the new macros.
Use the macros rather than rolling our own code.
Fix a variable name in text2pcap.c that apparently had the wrong name,
given the value that was being tested.
Change-Id: Ia788ca4e9f5fabd8d24e6ead5ff1817509f54827
Reviewed-on: https://code.wireshark.org/review/32010
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit b5036134c27b55e26dec584a8cc7a9ac844b136c)
Reviewed-on: https://code.wireshark.org/review/32394
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Actions performed:
from 5afde9b GSUP: remove the tree check
add 46d04be Add macros for the pack_flags field.
Summary of changes:
epan/dissectors/packet-frame.c | 85 ++++++++++++++++++++++--------------------
text2pcap.c | 42 ++++++++++-----------
ui/text_import.c | 8 ++--
wiretap/pcapng.c | 4 +-
wiretap/wtap.h | 73 +++++++++++++++++++++++++++++++++++-
5 files changed, 143 insertions(+), 69 deletions(-)
