Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 12:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix PktSrc setting next_timestamp even when no packet available

Browse source 
When pcap_next failed to return packet data, such as when a live packet
capture interface has no traffic, the next_timestamp member would still
be set to possibly uninitialized or meaningless data.

Maybe addresses #611.
This commit is contained in:
Jon Siwek 2011-09-22 14:04:28 -05:00
parent 928baf4b66
commit 73dcdbcfc5
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/PktSrc.cc
View file

@ -21,6 +21,7 @@ PktSrc::PktSrc()
{ {
interface = readfile = 0; interface = readfile = 0;
data = last_data = 0; data = last_data = 0;
memset(&hdr, 0, sizeof(hdr));
hdr_size = 0; hdr_size = 0;
datalink = 0; datalink = 0;
netmask = 0xffffff00; netmask = 0xffffff00;
@ -75,7 +76,9 @@ int PktSrc::ExtractNextPacket()
} }
data = last_data = pcap_next(pd, &hdr); data = last_data = pcap_next(pd, &hdr);
next_timestamp = hdr.ts.tv_sec + double(hdr.ts.tv_usec) / 1e6;
if ( data )
next_timestamp = hdr.ts.tv_sec + double(hdr.ts.tv_usec) / 1e6;
if ( pseudo_realtime ) if ( pseudo_realtime )
current_wallclock = current_time(true); current_wallclock = current_time(true);