Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08: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

26
src/Sessions.cc
View file

@ -11,7 +11,7 @@
#include <unistd.h>
#include "Desc.h"
#include "Net.h"
#include "RunState.h"
#include "Event.h"
#include "Timer.h"
#include "NetVar.h"
@ -633,11 +633,11 @@ void NetSessions::DoNextPacket(double t, const zeek::Packet* pkt, const zeek::IP
{
EncapsulatingConn ec(ip_hdr->SrcAddr(), ip_hdr->DstAddr(),
tunnel_type);
ip_tunnels[tunnel_idx] = TunnelActivity(ec, zeek::net::network_time);
zeek::detail::timer_mgr->Add(new detail::IPTunnelTimer(zeek::net::network_time, tunnel_idx));
ip_tunnels[tunnel_idx] = TunnelActivity(ec, zeek::run_state::network_time);
zeek::detail::timer_mgr->Add(new detail::IPTunnelTimer(zeek::run_state::network_time, tunnel_idx));
}
else
it->second.second = zeek::net::network_time;
it->second.second = zeek::run_state::network_time;
if ( gre_version == 0 )
DoNextInnerPacket(t, pkt, caplen, len, data, gre_link_type,
@ -759,9 +759,9 @@ void NetSessions::DoNextInnerPacket(double t, const zeek::Packet* pkt,
ts = pkt->ts;
else
{
ts.tv_sec = (time_t) zeek::net::network_time;
ts.tv_sec = (time_t) zeek::run_state::network_time;
ts.tv_usec = (suseconds_t)
((zeek::net::network_time - (double)ts.tv_sec) * 1000000);
((zeek::run_state::network_time - (double)ts.tv_sec) * 1000000);
}
const u_char* data = nullptr;
@ -797,9 +797,9 @@ void NetSessions::DoNextInnerPacket(double t, const zeek::Packet* pkt,
ts = pkt->ts;
else
{
ts.tv_sec = (time_t) zeek::net::network_time;
ts.tv_sec = (time_t) zeek::run_state::network_time;
ts.tv_usec = (suseconds_t)
((zeek::net::network_time - (double)ts.tv_sec) * 1000000);
((zeek::run_state::network_time - (double)ts.tv_sec) * 1000000);
}
EncapsulationStack* outer = prev ?
@ -1311,7 +1311,7 @@ bool NetSessions::WantConnection(uint16_t src_port, uint16_t dst_port,
void NetSessions::DumpPacket(const zeek::Packet *pkt, int len)
{
if ( ! zeek::net::detail::pkt_dumper )
if ( ! zeek::run_state::detail::pkt_dumper )
return;
if ( len != 0 )
@ -1322,7 +1322,7 @@ void NetSessions::DumpPacket(const zeek::Packet *pkt, int len)
const_cast<zeek::Packet *>(pkt)->cap_len = len;
}
zeek::net::detail::pkt_dumper->Dump(pkt);
zeek::run_state::detail::pkt_dumper->Dump(pkt);
}
void NetSessions::Weird(const char* name, const zeek::Packet* pkt,
@ -1351,7 +1351,7 @@ unsigned int NetSessions::ConnectionMemoryUsage()
{
unsigned int mem = 0;
if ( zeek::net::terminating )
if ( zeek::run_state::terminating )
// Connections have been flushed already.
return 0;
@ -1371,7 +1371,7 @@ unsigned int NetSessions::ConnectionMemoryUsageConnVals()
{
unsigned int mem = 0;
if ( zeek::net::terminating )
if ( zeek::run_state::terminating )
// Connections have been flushed already.
return 0;
@ -1389,7 +1389,7 @@ unsigned int NetSessions::ConnectionMemoryUsageConnVals()
unsigned int NetSessions::MemoryAllocation()
{
if ( zeek::net::terminating )
if ( zeek::run_state::terminating )
// Connections have been flushed already.
return 0;