F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch merge

Browse Source
This commit is contained in:
Craig Dowell
2010-04-19 08:39:31 -07:00
parent ba3152296c db8c9b8025
commit f049a5d503
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/pcap-file.cc
View File

@@ -417,6 +417,11 @@ PcapFile::Read (
m_file.read ((char *)&header.m_inclLen, sizeof(header.m_inclLen));
m_file.read ((char *)&header.m_origLen, sizeof(header.m_origLen));
if (m_file.fail ())
{
return;
}
if (m_swapMode)
{
Swap (&header, &header);
@@ -470,12 +475,18 @@ PcapFile::Diff (std::string const & f1, std::string const & f2,
uint32_t readLen1, readLen2;
bool diff = false;
while (!pcap1.Eof () && !pcap2.Eof ()
&& !pcap1.Fail () && !pcap2.Fail ())
while (!pcap1.Eof () && !pcap2.Eof ())
{
pcap1.Read (data1, snapLen, tsSec1, tsUsec1, inclLen1, origLen1, readLen1);
pcap2.Read (data2, snapLen, tsSec2, tsUsec2, inclLen2, origLen2, readLen2);
bool bad = pcap1.Fail () || pcap2.Fail ();
if (bad)
{
diff = true;
break;
}
if (tsSec1 != tsSec2 || tsUsec1 != tsUsec2)
{
diff = true; // Next packet timestamps do not match