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

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

16
src/Conn.cc
View file

@ -7,7 +7,7 @@
#include <ctype.h>
#include "Desc.h"
#include "Net.h"
#include "RunState.h"
#include "NetVar.h"
#include "Event.h"
#include "Sessions.h"
@ -194,8 +194,8 @@ void Connection::NextPacket(double t, bool is_orig,
// arguments for reproducing packets
const zeek::Packet *pkt)
{
zeek::net::current_timestamp = t;
zeek::net::current_pkt = pkt;
zeek::run_state::current_timestamp = t;
zeek::run_state::current_pkt = pkt;
if ( Skipping() )
return;
@ -218,13 +218,13 @@ void Connection::NextPacket(double t, bool is_orig,
else
last_time = t;
zeek::net::current_timestamp = 0;
zeek::net::current_pkt = nullptr;
zeek::run_state::current_timestamp = 0;
zeek::run_state::current_pkt = nullptr;
}
void Connection::SetLifetime(double lifetime)
{
ADD_TIMER(&Connection::DeleteTimer, zeek::net::network_time + lifetime, 0,
ADD_TIMER(&Connection::DeleteTimer, zeek::run_state::network_time + lifetime, 0,
zeek::detail::TIMER_CONN_DELETE);
}
@ -329,7 +329,7 @@ void Connection::EnableStatusUpdateTimer()
if ( connection_status_update && zeek::detail::connection_status_update_interval )
{
ADD_TIMER(&Connection::StatusUpdateTimer,
zeek::net::network_time + zeek::detail::connection_status_update_interval, 0,
zeek::run_state::network_time + zeek::detail::connection_status_update_interval, 0,
zeek::detail::TIMER_CONN_STATUS_UPDATE);
installed_status_timer = 1;
}
@ -339,7 +339,7 @@ void Connection::StatusUpdateTimer(double t)
{
EnqueueEvent(connection_status_update, nullptr, ConnVal());
ADD_TIMER(&Connection::StatusUpdateTimer,
zeek::net::network_time + zeek::detail::connection_status_update_interval, 0,
zeek::run_state::network_time + zeek::detail::connection_status_update_interval, 0,
zeek::detail::TIMER_CONN_STATUS_UPDATE);
}