matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save PCAP always in nanosecond PCAP format

Browse Source 
Updates #238
This commit is contained in:
Srivats P 2022-01-17 18:49:24 +05:30
parent d09d83000e
commit 45d5e15f23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/pcapfileformat.cpp
View File

@ -655,7 +655,7 @@ bool PcapFileFormat::save(const OstProto::StreamConfigList streams,
fd_.setDevice(&file); fd_.setDevice(&file);
fileHdr.magicNumber = kPcapFileMagic; fileHdr.magicNumber = kNanoSecondPcapFileMagic;
fileHdr.versionMajor = kPcapFileVersionMajor; fileHdr.versionMajor = kPcapFileVersionMajor;
fileHdr.versionMinor = kPcapFileVersionMinor; fileHdr.versionMinor = kPcapFileVersionMinor;
fileHdr.thisZone = 0; fileHdr.thisZone = 0;
@ -703,11 +703,16 @@ bool PcapFileFormat::save(const OstProto::StreamConfigList streams,
fd_.writeRawData(pktBuf.data(), pktHdr.inclLen); fd_.writeRawData(pktBuf.data(), pktHdr.inclLen);
if (s.packetRate()) if (s.packetRate())
pktHdr.tsUsec += quint32(1e6/s.packetRate()); {
if (pktHdr.tsUsec >= 1000000) quint64 delta = quint64(1e9/s.packetRate());
pktHdr.tsSec += delta/quint32(1e9);
pktHdr.tsUsec += delta % quint32(1e9);
}
if (pktHdr.tsUsec >= quint32(1e9))
{ {
pktHdr.tsSec++; pktHdr.tsSec++;
pktHdr.tsUsec -= 1000000; pktHdr.tsUsec -= quint32(1e9);
} }
emit progress(i); emit progress(i);