Move zeek::net namespace to zeek::run_state namespace.

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

View file

@ -7,7 +7,7 @@
#include "MsgThread.h"
#include "Manager.h"
#include "iosource/Manager.h"
#include "Net.h"
#include "RunState.h"
// Set by Zeek's main signal handler.
extern int signal_val;
@ -229,7 +229,7 @@ void MsgThread::OnSignalStop()
child_sent_finish = true;
// Signal thread to terminate.
SendIn(new detail::FinishMessage(this, zeek::net::network_time), true);
SendIn(new detail::FinishMessage(this, zeek::run_state::network_time), true);
}
void MsgThread::OnWaitForStop()
@ -303,7 +303,7 @@ void MsgThread::Heartbeat()
if ( child_sent_finish )
return;
SendIn(new detail::HeartbeatMessage(this, zeek::net::network_time, zeek::util::current_time()));
SendIn(new detail::HeartbeatMessage(this, zeek::run_state::network_time, zeek::util::current_time()));
}
void MsgThread::Finished()
@ -450,7 +450,7 @@ void MsgThread::Run()
// anymore.
if ( ! child_finished && ! Killed() )
{
OnFinish(zeek::net::network_time);
OnFinish(zeek::run_state::network_time);
Finished();
}
}