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

Move Session code to namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-22 11:15:58 -07:00
parent 4e9a5e9d98
commit e3ee1860b8
21 changed files with 89 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/analyzer/protocol/tcp/TCP.cc
View file

@ -1277,7 +1277,7 @@ void TCP_Analyzer::FlipRoles()
{
Analyzer::FlipRoles();
sessions->tcp_stats.FlipState(orig->state, resp->state);
zeek::sessions->tcp_stats.FlipState(orig->state, resp->state);
TCP_Endpoint* tmp_ep = resp;
resp = orig;
orig = tmp_ep;
@ -1485,7 +1485,7 @@ void TCP_Analyzer::AttemptTimer(double /* t */)
is_active = 0;
// All done with this connection.
sessions->Remove(Conn());
zeek::sessions->Remove(Conn());
}
}
@ -1505,7 +1505,7 @@ void TCP_Analyzer::PartialCloseTimer(double /* t */)
return;
Event(connection_partial_close);
sessions->Remove(Conn());
zeek::sessions->Remove(Conn());
}
}
@ -1535,7 +1535,7 @@ void TCP_Analyzer::ExpireTimer(double t)
// the session remove and Unref() us here.
Event(connection_timeout);
is_active = 0;
sessions->Remove(Conn());
zeek::sessions->Remove(Conn());
return;
}
}
@ -1550,7 +1550,7 @@ void TCP_Analyzer::ExpireTimer(double t)
// before setting up an attempt timer,
// so we need to clean it up here.
Event(connection_timeout);
sessions->Remove(Conn());
zeek::sessions->Remove(Conn());
return;
}
}
@ -1571,12 +1571,12 @@ void TCP_Analyzer::ResetTimer(double /* t */)
if ( ! BothClosed() )
ConnectionReset();
sessions->Remove(Conn());
zeek::sessions->Remove(Conn());
}
void TCP_Analyzer::DeleteTimer(double /* t */)
{
sessions->Remove(Conn());
zeek::sessions->Remove(Conn());
}
void TCP_Analyzer::ConnDeleteTimer(double t)
@ -1694,7 +1694,7 @@ void TCP_Analyzer::ConnectionClosed(TCP_Endpoint* endpoint, TCP_Endpoint* peer,
// Note, even if tcp_close_delay is zero, we can't
// simply do:
//
// sessions->Remove(this);
// zeek::sessions->Remove(this);
//
// here, because that would cause the object to be
// deleted out from under us.