Move the functions and variables in Net.h to the zeek::net namespace. This includes moving network_time out of util.h.

This commit is contained in:
Tim Wojtulewicz 2020-08-05 11:37:20 -07:00
parent ca9baec6e8
commit e7c6d51ae7
55 changed files with 461 additions and 374 deletions

View file

@ -1908,7 +1908,7 @@ DNS_Analyzer::DNS_Analyzer(zeek::Connection* conn)
else
{
ADD_ANALYZER_TIMER(&DNS_Analyzer::ExpireTimer,
network_time + dns_session_timeout, true,
zeek::net::network_time + dns_session_timeout, true,
zeek::detail::TIMER_DNS_EXPIRE);
}
}
@ -1956,7 +1956,7 @@ void DNS_Analyzer::ExpireTimer(double t)
// The - 1.0 in the following is to allow 1 second for the
// common case of a single request followed by a single reply,
// so we don't needlessly set the timer twice in that case.
if ( t - Conn()->LastTime() >= dns_session_timeout - 1.0 || terminating )
if ( t - Conn()->LastTime() >= dns_session_timeout - 1.0 || zeek::net::terminating )
{
Event(connection_timeout);
zeek::sessions->Remove(Conn());