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

Move Timer and PriorityQueue classes to namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-20 13:52:54 -07:00
parent 910aa77d95
commit 1c17700c48
33 changed files with 206 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,8 +128,8 @@ TCP_Analyzer::TCP_Analyzer(Connection* conn)
{
// Set a timer to eventually time out this connection.
ADD_ANALYZER_TIMER(&TCP_Analyzer::ExpireTimer,
network_time + tcp_SYN_timeout, false,
TIMER_TCP_EXPIRE);
network_time + tcp_SYN_timeout, false,
zeek::detail::TIMER_TCP_EXPIRE);
deferred_gen_event = close_deferred = 0;
@ -496,8 +496,8 @@ void TCP_Analyzer::UpdateInactiveState(double t,
if ( tcp_attempt_delay )
ADD_ANALYZER_TIMER(&TCP_Analyzer::AttemptTimer,
t + tcp_attempt_delay, true,
TIMER_TCP_ATTEMPT);
t + tcp_attempt_delay, true,
zeek::detail::TIMER_TCP_ATTEMPT);
}
else
{
@ -726,8 +726,8 @@ void TCP_Analyzer::UpdateClosedState(double t, TCP_Endpoint* endpoint,
if ( connection_reset )
ADD_ANALYZER_TIMER(&TCP_Analyzer::ResetTimer,
t + tcp_reset_delay, true,
TIMER_TCP_RESET);
t + tcp_reset_delay, true,
zeek::detail::TIMER_TCP_RESET);
}
}
@ -1560,7 +1560,7 @@ void TCP_Analyzer::ExpireTimer(double t)
// ### if PQ_Element's were Obj's, could just Ref the timer
// and adjust its value here, instead of creating a new timer.
ADD_ANALYZER_TIMER(&TCP_Analyzer::ExpireTimer, t + tcp_session_timer,
false, TIMER_TCP_EXPIRE);
false, zeek::detail::TIMER_TCP_EXPIRE);
}
void TCP_Analyzer::ResetTimer(double /* t */)
@ -1700,11 +1700,11 @@ void TCP_Analyzer::ConnectionClosed(TCP_Endpoint* endpoint, TCP_Endpoint* peer,
// deleted out from under us.
if ( tcp_close_delay != 0.0 )
ADD_ANALYZER_TIMER(&TCP_Analyzer::ConnDeleteTimer,
Conn()->LastTime() + tcp_close_delay, false,
TIMER_CONN_DELETE);
Conn()->LastTime() + tcp_close_delay, false,
zeek::detail::TIMER_CONN_DELETE);
else
ADD_ANALYZER_TIMER(&TCP_Analyzer::DeleteTimer, Conn()->LastTime(), false,
TIMER_TCP_DELETE);
zeek::detail::TIMER_TCP_DELETE);
}
else
@ -1713,8 +1713,8 @@ void TCP_Analyzer::ConnectionClosed(TCP_Endpoint* endpoint, TCP_Endpoint* peer,
{ // First time we've seen anything from this side.
if ( connection_partial_close )
ADD_ANALYZER_TIMER(&TCP_Analyzer::PartialCloseTimer,
Conn()->LastTime() + tcp_partial_close_delay, false,
TIMER_TCP_PARTIAL_CLOSE );
Conn()->LastTime() + tcp_partial_close_delay, false,
zeek::detail::TIMER_TCP_PARTIAL_CLOSE );
}
else
@ -1722,8 +1722,8 @@ void TCP_Analyzer::ConnectionClosed(TCP_Endpoint* endpoint, TCP_Endpoint* peer,
// Create a timer to look for the other side closing,
// too.
ADD_ANALYZER_TIMER(&TCP_Analyzer::ExpireTimer,
Conn()->LastTime() + tcp_session_timer, false,
TIMER_TCP_EXPIRE);
Conn()->LastTime() + tcp_session_timer, false,
zeek::detail::TIMER_TCP_EXPIRE);
}
}
}