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

Merge branch 'topic/jgras/expire-redef' of https://github.com/J-Gras/bro

Browse source 
Extended error handling a bit, and increased serialization
data format version.
This commit is contained in:
Robin Sommer 2016-06-14 17:14:15 -07:00
commit 9da02ecae4
12 changed files with 159 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/Val.cc
View file

@ -1323,7 +1323,7 @@ void TableVal::Init(TableType* t)
{
::Ref(t);
table_type = t;
expire_expr = 0;
expire_func = 0;
expire_time = 0;
expire_cookie = 0;
timer = 0;
@ -1350,7 +1350,8 @@ TableVal::~TableVal()
delete subnets;
Unref(attrs);
Unref(def_val);
Unref(expire_expr);
Unref(expire_func);
Unref(expire_time);
}
void TableVal::RemoveAll()
@ -1399,8 +1400,8 @@ void TableVal::SetAttrs(Attributes* a)
Attr* ef = attrs->FindAttr(ATTR_EXPIRE_FUNC);
if ( ef )
{
expire_expr = ef->AttrExpr();
expire_expr->Ref();
expire_func = ef->AttrExpr();
expire_func->Ref();
}
}
@ -1410,15 +1411,17 @@ void TableVal::CheckExpireAttr(attr_tag at)
if ( a )
{
Val* timeout = a->AttrExpr()->Eval(0);
if ( ! timeout )
expire_time = a->AttrExpr();
expire_time->Ref();
if ( expire_time->Type()->Tag() != TYPE_INTERVAL )
{
a->AttrExpr()->Error("value of timeout not fixed");
if ( ! expire_time->IsError() )
expire_time->SetError("expiration interval has wrong type");
return;
}
expire_time = timeout->AsInterval();
if ( timer )
timer_mgr->Cancel(timer);
@ -1791,7 +1794,7 @@ Val* TableVal::Lookup(Val* index, bool use_default_val)
if ( attrs && attrs->FindAttr(ATTR_EXPIRE_READ) )
{
v->SetExpireAccess(network_time);
if ( LoggingAccess() && expire_time )
if ( LoggingAccess() && ExpirationEnabled() )
ReadOperation(index, v);
}
@ -1822,7 +1825,7 @@ Val* TableVal::Lookup(Val* index, bool use_default_val)
if ( attrs && attrs->FindAttr(ATTR_EXPIRE_READ) )
{
v->SetExpireAccess(network_time);
if ( LoggingAccess() && expire_time )
if ( LoggingAccess() && ExpirationEnabled() )
ReadOperation(index, v);
}
@ -1880,7 +1883,7 @@ TableVal* TableVal::LookupSubnetValues(const SubNetVal* search)
if ( attrs && attrs->FindAttr(ATTR_EXPIRE_READ) )
{
entry->SetExpireAccess(network_time);
if ( LoggingAccess() && expire_time )
if ( LoggingAccess() && ExpirationEnabled() )
ReadOperation(s, entry);
}
}
@ -2176,6 +2179,13 @@ void TableVal::DoExpire(double t)
PDict(TableEntryVal)* tbl = AsNonConstTable();
double timeout = GetExpireTime();
if ( timeout < 0 )
// Skip in case of unset/invalid expiration value. If it's an
// error, it has been reported already.
return;
if ( ! expire_cookie )
{
expire_cookie = tbl->InitForIteration();
@ -2197,11 +2207,11 @@ void TableVal::DoExpire(double t)
// correct, so we just need to wait.
}
else if ( v->ExpireAccessTime() + expire_time < t )
else if ( v->ExpireAccessTime() + timeout < t )
{
Val* val = v->Value();
if ( expire_expr )
if ( expire_func )
{
Val* idx = RecoverIndex(k);
double secs = CallExpireFunc(idx);
@ -2221,7 +2231,7 @@ void TableVal::DoExpire(double t)
{
// User doesn't want us to expire
// this now.
v->SetExpireAccess(network_time - expire_time + secs);
v->SetExpireAccess(network_time - timeout + secs);
delete k;
continue;
}
@ -2258,9 +2268,27 @@ void TableVal::DoExpire(double t)
InitTimer(table_expire_delay);
}
double TableVal::GetExpireTime()
{
if ( ! expire_time )
return -1;
Val* timeout = expire_time->Eval(0);
if ( timeout && (timeout->AsInterval() >= 0) )
return timeout->AsInterval();
expire_time = 0;
if ( timer )
timer_mgr->Cancel(timer);
return -1;
}
double TableVal::CallExpireFunc(Val* idx)
{
if ( ! expire_expr )
if ( ! expire_func )
{
Unref(idx);
return 0;
@ -2285,7 +2313,7 @@ double TableVal::CallExpireFunc(Val* idx)
try
{
Val* vf = expire_expr->Eval(0);
Val* vf = expire_func->Eval(0);
if ( ! vf )
{
@ -2319,11 +2347,18 @@ double TableVal::CallExpireFunc(Val* idx)
void TableVal::ReadOperation(Val* index, TableEntryVal* v)
{
double timeout = GetExpireTime();
if ( timeout < 0 )
// Skip in case of unset/invalid expiration value. If it's an
// error, it has been reported already.
return;
// In theory we need to only propagate one update per &read_expire
// interval to prevent peers from expiring intervals. To account for
// practical issues such as latency, we send one update every half
// &read_expire.
if ( network_time - v->LastReadUpdate() > expire_time / 2 )
if ( network_time - v->LastReadUpdate() > timeout / 2 )
{
StateAccess::Log(new StateAccess(OP_READ_IDX, this, index));
v->SetLastReadUpdate(network_time);
@ -2362,11 +2397,9 @@ bool TableVal::DoSerialize(SerialInfo* info) const
state->did_index = false;
info->s->WriteOpenTag(table_type->IsSet() ? "set" : "table");
if ( ! SERIALIZE(expire_time) )
return false;
SERIALIZE_OPTIONAL(attrs);
SERIALIZE_OPTIONAL(expire_expr);
SERIALIZE_OPTIONAL(expire_time);
SERIALIZE_OPTIONAL(expire_func);
// Make sure nobody kills us in between.
const_cast<TableVal*>(this)->Ref();
@ -2491,13 +2524,11 @@ bool TableVal::DoUnserialize(UnserialInfo* info)
{
DO_UNSERIALIZE(MutableVal);
if ( ! UNSERIALIZE(&expire_time) )
return false;
Init((TableType*) type);
UNSERIALIZE_OPTIONAL(attrs, Attributes::Unserialize(info));
UNSERIALIZE_OPTIONAL(expire_expr, Expr::Unserialize(info));
UNSERIALIZE_OPTIONAL(expire_time, Expr::Unserialize(info));
UNSERIALIZE_OPTIONAL(expire_func, Expr::Unserialize(info));
while ( true )
{