Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 04:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ensure time continues moving forward if a pcap source is suspended

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-01 11:28:26 -07:00
parent 5377dd446d
commit 2c8d0f60da
5 changed files with 61 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Timer.cc
View file

@ -93,7 +93,7 @@ void TimerMgr::Process()
// pseudo-realtime), advance the timer here to the current time since otherwise it won't
// move forward and the timers won't fire correctly.
iosource::PktSrc* pkt_src = iosource_mgr->GetPktSrc();
if ( ! pkt_src || ! pkt_src->IsOpen() || reading_live )
if ( ! pkt_src || ! pkt_src->IsOpen() || reading_live || net_is_processing_suspended() )
net_update_time(current_time());
// Just advance the timer manager based on the current network time. This won't actually

2
src/iosource/Manager.cc
View file

@ -167,7 +167,7 @@ void Manager::FindReadySources(std::vector<IOSource*>* ready)
else
{
if ( ! pseudo_realtime )
// A pcap file is always ready to process.
// A pcap file is always ready to process unless it's suspended
ready->push_back(pkt_src);
}
}