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 session code into new directory and into zeek::session namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-04-26 13:47:06 -07:00
parent 3ee171eb2d
commit 18c6aaaa33
38 changed files with 143 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Conn.cc
View file

@ -10,7 +10,7 @@
#include "zeek/RunState.h"
#include "zeek/NetVar.h"
#include "zeek/Event.h"
#include "zeek/SessionManager.h"
#include "zeek/session/SessionManager.h"
#include "zeek/Reporter.h"
#include "zeek/Timer.h"
#include "zeek/iosource/IOSource.h"
@ -380,7 +380,7 @@ void Connection::FlipRoles()
unsigned int Connection::MemoryAllocation() const
{
return Session::MemoryAllocation() + padded_sizeof(*this)
return session::Session::MemoryAllocation() + padded_sizeof(*this)
+ (timers.MemoryAllocation() - padded_sizeof(timers))
+ (conn_val ? conn_val->MemoryAllocation() : 0)
+ (root_analyzer ? root_analyzer->MemoryAllocation(): 0)
@ -395,7 +395,7 @@ unsigned int Connection::MemoryAllocationVal() const
void Connection::Describe(ODesc* d) const
{
Session::Describe(d);
session::Session::Describe(d);
switch ( proto ) {
case TRANSPORT_TCP: