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

Move iosource code to zeek namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-01 10:48:21 -07:00
parent 45b5c6e619
commit be92bd536f
35 changed files with 180 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Timer.cc
View file

@ -69,8 +69,8 @@ TimerMgr::TimerMgr()
num_expired = 0;
last_advance = last_timestamp = 0;
if ( iosource_mgr )
iosource_mgr->Register(this, true);
if ( zeek::iosource_mgr )
zeek::iosource_mgr->Register(this, true);
}
TimerMgr::~TimerMgr()
@ -95,7 +95,7 @@ void TimerMgr::Process()
// If we don't have a source, or the source is closed, or we're reading live (which includes
// 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();
iosource::PktSrc* pkt_src = zeek::iosource_mgr->GetPktSrc();
if ( ! pkt_src || ! pkt_src->IsOpen() || reading_live || net_is_processing_suspended() )
net_update_time(current_time());
@ -106,8 +106,8 @@ void TimerMgr::Process()
void TimerMgr::InitPostScript()
{
if ( iosource_mgr )
iosource_mgr->Register(this, true);
if ( zeek::iosource_mgr )
zeek::iosource_mgr->Register(this, true);
}
PQ_TimerMgr::PQ_TimerMgr() : TimerMgr()