diff options
| author | Guy Harris <gharris@sonic.net> | 2020-10-19 23:25:11 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-10-20 00:39:37 -0700 |
| commit | a11b9fb7a02ae6c959831e6852ddfa5c2283c81c (patch) | |
| tree | fc830e5494d30a6ef94a459adcd9278d94131760 /wiretap/merge.c | |
| parent | 89e96c1e77a39a259cafb488c6057e6c123d692b (diff) | |
Add an API to determine whether a file type uses interface IDs.
Currently, the only file types that use them are pcapng and IBM's
iptrace; we don't support writing the latter, so this is mainly of
interest for pcapng.
This makes it a bit more obvious what some "is this pcapng?" tests are
really trying to determine, and allows them to automatically support any
new file types that use them.
(With regard to interface descriptions, tere are three types of file:
1) files that contain no interface information;
2) files that contain "just FYI" interface information but that don't
tie packets or other records to particular interfaces;
3) files that contain interface information and tie all packets (and
possibly other records) to an interface.
This tests for files of type 3.)
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index 6aae6a6548..4281b042d2 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -908,7 +908,7 @@ merge_process_packets(wtap_dumper *pdh, const int file_type, break; } - if (file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG) { + if (wtap_uses_interface_ids(file_type)) { /* * XXX - We should do this only for record types * that pertain to a particular interface; for |