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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

7
src/threading/MsgThread.cc
View file

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