diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-03 12:58:36 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-03 19:59:08 +0000 |
| commit | 30c86f8b34233b1cf262c14660d32388bc7362d9 (patch) | |
| tree | 1930ddcdc75ef79a170bf474b1a4550a88a7a6de /wiretap/merge.c | |
| parent | 69ed5d5841605c63cbe017a2a0006f4085b8bb23 (diff) | |
| download | wireshark-30c86f8b34233b1cf262c14660d32388bc7362d9.tar.gz | |
Don't keep the pcap/pcapng link-layer header type as interface data.
Either 1) it can be determined from the libwiretap encapsulation type,
in which case it's redundant information or 2) there *is* no pcap/pcapng
link-layer header type for that encapsulation type, in which case you
need to check for the attempt to determine it failing and handle that
failure appropriately.
Change-Id: Ie9557b513365c1fc8c6df74b9c8239e29aad46bc
Reviewed-on: https://code.wireshark.org/review/21924
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index 8605b7fbeb..0ba1b81a66 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -460,14 +460,6 @@ is_duplicate_idb(const wtap_block_t idb1, const wtap_block_t idb2) return FALSE; } - merge_debug("idb1_mand->link_type == idb2_mand->link_type: %s", - (idb1_mand->link_type == idb2_mand->link_type) ? "TRUE":"FALSE"); - if (idb1_mand->link_type != idb2_mand->link_type) { - /* Clearly not the same interface. */ - merge_debug("merge::is_duplicate_idb() returning FALSE"); - return FALSE; - } - merge_debug("idb1_mand->time_units_per_second == idb2_mand->time_units_per_second: %s", (idb1_mand->time_units_per_second == idb2_mand->time_units_per_second) ? "TRUE":"FALSE"); if (idb1_mand->time_units_per_second != idb2_mand->time_units_per_second) { |