From 487f3e653dbef73219ac99adea5327a48e3f38a4 Mon Sep 17 00:00:00 2001 From: Srivats P Date: Fri, 3 Apr 2020 20:29:18 +0530 Subject: [PATCH] Fix missing packet summary line in pcap import diff Looks like starting somewhere in Wireshark 2.x, when we give -x to tshark, we also need to explicitly give -P to include the one-line summary of the packet. This one-line summary is used in the diff to find out which packets experienced a diff. --- common/pcapfileformat.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/pcapfileformat.cpp b/common/pcapfileformat.cpp index c6eba2b..79e70ce 100644 --- a/common/pcapfileformat.cpp +++ b/common/pcapfileformat.cpp @@ -276,6 +276,7 @@ bool PcapFileFormat::open(const QString fileName, QStringList() << QString("-r%1").arg(fileName) << "-otcp.desegment_tcp_streams:FALSE" + << "-P" << "-x"); if (!tshark.waitForStarted(-1)) { @@ -336,6 +337,7 @@ bool PcapFileFormat::open(const QString fileName, QStringList() << QString("-r%1").arg(importedPcapFile.fileName()) << "-otcp.desegment_tcp_streams:FALSE" + << "-P" << "-x"); if (!tshark.waitForStarted(-1)) {