From b6e358962e0172600e936d5b317e4d7141c11617 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 04:48:45 -0400 Subject: [PATCH] import wireshark-2.6.2-12.el8 --- SOURCES/wireshark-0025-drop-count.patch | 33 +++++++++++++++++++++++++ SPECS/wireshark.spec | 7 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 SOURCES/wireshark-0025-drop-count.patch diff --git a/SOURCES/wireshark-0025-drop-count.patch b/SOURCES/wireshark-0025-drop-count.patch new file mode 100644 index 0000000..8837817 --- /dev/null +++ b/SOURCES/wireshark-0025-drop-count.patch @@ -0,0 +1,33 @@ +diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c +index 7b398cf..91fd9b8 100644 +--- a/wiretap/pcapng.c ++++ b/wiretap/pcapng.c +@@ -3230,6 +3230,10 @@ pcapng_write_enhanced_packet_block(wtap_dumper *wdh, const wtap_rec *rec, + have_options = TRUE; + options_total_length = options_total_length + 8; + } ++ if (rec->presence_flags & WTAP_HAS_DROP_COUNT) { ++ have_options = TRUE; ++ options_total_length = options_total_length + 12; ++ } + if (have_options) { + /* End-of options tag */ + options_total_length += 4; +@@ -3353,6 +3357,17 @@ pcapng_write_enhanced_packet_block(wtap_dumper *wdh, const wtap_rec *rec, + wdh->bytes_dumped += 4; + pcapng_debug("pcapng_write_enhanced_packet_block: Wrote Options packet flags: %x", rec->rec_header.packet_header.pack_flags); + } ++ if (rec->presence_flags & WTAP_HAS_DROP_COUNT) { ++ option_hdr.type = OPT_EPB_DROPCOUNT; ++ option_hdr.value_length = 8; ++ if (!wtap_dump_file_write(wdh, &option_hdr, 4, err)) ++ return FALSE; ++ wdh->bytes_dumped += 4; ++ if (!wtap_dump_file_write(wdh, &rec->rec_header.packet_header.drop_count, 8, err)) ++ return FALSE; ++ wdh->bytes_dumped += 8; ++ pcapng_debug("pcapng_write_enhanced_packet_block: Wrote Options drop count: %" G_GINT64_MODIFIER "u", rec->rec_header.packet_header.drop_count); ++ } + /* Write end of options if we have options */ + if (have_options) { + if (!wtap_dump_file_write(wdh, &zero_pad, 4, err)) diff --git a/SPECS/wireshark.spec b/SPECS/wireshark.spec index e479403..50544c7 100644 --- a/SPECS/wireshark.spec +++ b/SPECS/wireshark.spec @@ -6,7 +6,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 2.6.2 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -57,6 +57,8 @@ Patch23: wireshark-0023-desktop-file.patch #Fixing a couple of issues found by covscan Patch24: wireshark-0024-covscan.patch +Patch25: wireshark-0025-drop-count.patch + #install tshark together with wireshark GUI Requires: %{name}-cli = %{epoch}:%{version}-%{release} @@ -304,6 +306,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Oct 29 2019 Michal Ruprich - 1:2.6.2-12 +- Resolves: #1609737 - wiretap does not write "drop_count" in pcapng format + * Mon Apr 29 2019 Michal Ruprich - 1:2.6.2-11 - Related: #1602731 - Fixing multilib problem in devel subpackage