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

Merge remote-tracking branch 'origin/master' into topic/bernhard/input-threads

Browse source 
Conflicts:
	src/threading/Manager.cc
This commit is contained in:
Bernhard Amann 2012-04-10 22:12:54 +02:00
commit 62519f4408
97 changed files with 1497 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Val.cc
View file

@ -2141,10 +2141,13 @@ void TableVal::DoExpire(double t)
(v = tbl->NextEntry(k, expire_cookie)); ++i )
{
if ( v->ExpireAccessTime() == 0 )
{
// This happens when we insert val while network_time
// hasn't been initialized yet (e.g. in bro_init()).
// We correct the timestamp now.
v->SetExpireAccess(network_time);
// hasn't been initialized yet (e.g. in bro_init()), and
// also when bro_start_network_time hasn't been initialized
// (e.g. before first packet). The expire_access_time is
// correct, so we just need to wait.
}
else if ( v->ExpireAccessTime() + expire_time < t )
{