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

Move zeek::net namespace to zeek::run_state namespace.

Browse source 
This also moves all of the code from Net.{h,cc} to RunState.{h,cc} and marks Net.h as deprecated
This commit is contained in:
Tim Wojtulewicz 2020-08-19 17:41:24 -07:00
parent d608e7c9a5
commit 0ac3fafe13
64 changed files with 477 additions and 467 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/iosource/PktSrc.cc
View file

@ -7,7 +7,7 @@
#include "util.h"
#include "Hash.h"
#include "Net.h"
#include "RunState.h"
#include "Sessions.h"
#include "broker/Manager.h"
#include "iosource/Manager.h"
@ -82,7 +82,7 @@ double PktSrc::CurrentPacketTimestamp()
double PktSrc::CurrentPacketWallClock()
{
// We stop time when we are suspended.
if ( zeek::net::net_is_processing_suspended() )
if ( zeek::run_state::net_is_processing_suspended() )
current_wallclock = zeek::util::current_time(true);
return current_wallclock;
@ -175,9 +175,9 @@ double PktSrc::CheckPseudoTime()
return 0;
double pseudo_time = current_packet.time - first_timestamp;
double ct = (zeek::util::current_time(true) - first_wallclock) * zeek::net::pseudo_realtime;
double ct = (zeek::util::current_time(true) - first_wallclock) * zeek::run_state::pseudo_realtime;
return pseudo_time <= ct ? zeek::net::zeek_start_time + pseudo_time : 0;
return pseudo_time <= ct ? zeek::run_state::zeek_start_time + pseudo_time : 0;
}
void PktSrc::InitSource()
@ -201,16 +201,16 @@ void PktSrc::Process()
if ( current_packet.Layer2Valid() )
{
if ( zeek::net::pseudo_realtime )
if ( zeek::run_state::pseudo_realtime )
{
current_pseudo = CheckPseudoTime();
zeek::net::detail::net_packet_dispatch(current_pseudo, &current_packet, this);
zeek::run_state::detail::net_packet_dispatch(current_pseudo, &current_packet, this);
if ( ! first_wallclock )
first_wallclock = zeek::util::current_time(true);
}
else
zeek::net::detail::net_packet_dispatch(current_packet.time, &current_packet, this);
zeek::run_state::detail::net_packet_dispatch(current_packet.time, &current_packet, this);
}
have_packet = false;
@ -231,10 +231,10 @@ bool PktSrc::ExtractNextPacketInternal()
// Don't return any packets if processing is suspended (except for the
// very first packet which we need to set up times).
if ( zeek::net::net_is_processing_suspended() && first_timestamp )
if ( zeek::run_state::net_is_processing_suspended() && first_timestamp )
return false;
if ( zeek::net::pseudo_realtime )
if ( zeek::run_state::pseudo_realtime )
current_wallclock = zeek::util::current_time(true);
if ( ExtractNextPacket(&current_packet) )
@ -252,7 +252,7 @@ bool PktSrc::ExtractNextPacketInternal()
return true;
}
if ( zeek::net::pseudo_realtime && ! IsOpen() )
if ( zeek::run_state::pseudo_realtime && ! IsOpen() )
{
if ( broker_mgr->Active() )
iosource_mgr->Terminate();
@ -344,16 +344,16 @@ double PktSrc::GetNextTimeout()
// but we're not in pseudo-realtime mode, let the loop just spin as fast as it can. If we're
// in pseudo-realtime mode, find the next time that a packet is ready and have poll block until
// then.
if ( IsLive() || zeek::net::net_is_processing_suspended() )
if ( IsLive() || zeek::run_state::net_is_processing_suspended() )
return -1;
else if ( ! zeek::net::pseudo_realtime )
else if ( ! zeek::run_state::pseudo_realtime )
return 0;
if ( ! have_packet )
ExtractNextPacketInternal();
double pseudo_time = current_packet.time - first_timestamp;
double ct = (zeek::util::current_time(true) - first_wallclock) * zeek::net::pseudo_realtime;
double ct = (zeek::util::current_time(true) - first_wallclock) * zeek::run_state::pseudo_realtime;
return std::max(0.0, pseudo_time - ct);
}