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

make filter removal and stream closure asynchronous.

Browse source
This commit is contained in:
Bernhard Amann 2012-02-15 15:14:04 -08:00
parent 88233efb2c
commit a850cc5992
6 changed files with 200 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/input/Manager.cc
View file

@ -534,7 +534,6 @@ bool Manager::RemoveStream(const EnumVal* id) {
if ( (*s)->id == id )
{
i = (*s);
readers.erase(s); // remove from vector
break;
}
}
@ -545,11 +544,29 @@ bool Manager::RemoveStream(const EnumVal* id) {
i->reader->Finish();
delete(i);
return true;
}
bool Manager::RemoveStreamContinuation(const ReaderFrontend* reader) {
ReaderInfo *i = 0;
for ( vector<ReaderInfo *>::iterator s = readers.begin(); s != readers.end(); ++s )
{
if ( (*s)->reader && (*s)->reader == reader )
{
i = *s;
delete(i);
readers.erase(s);
return true;
}
}
reporter->Error("Stream not found in RemoveStreamContinuation");
return false;
}
bool Manager::UnrollRecordType(vector<Field*> *fields, const RecordType *rec, const string& nameprepend) {
for ( int i = 0; i < rec->NumFields(); i++ )
{
@ -615,20 +632,51 @@ bool Manager::RemoveTableFilter(EnumVal* id, const string &name) {
return false;
}
map<int, Manager::Filter*>::iterator it = i->filters.find(id->InternalInt());
if ( it == i->filters.end() ) {
bool found = false;
int filterId;
for ( map<int, Manager::Filter*>::iterator it = i->filters.begin(); it != i->filters.end(); ++it ) {
if ( (*it).second->name == name ) {
found = true;
filterId = (*it).first;
if ( (*it).second->filter_type != TABLE_FILTER ) {
reporter->Error("Trying to remove filter %s of wrong type", name.c_str());
return false;
}
break;
}
}
if ( !found ) {
reporter->Error("Trying to remove nonexisting filter %s", name.c_str());
return false;
}
if ( i->filters[id->InternalInt()]->filter_type != TABLE_FILTER ) {
// wrong type;
i->reader->RemoveFilter(filterId);
return true;
}
bool Manager::RemoveFilterContinuation(const ReaderFrontend* reader, const int filterId) {
ReaderInfo *i = FindReader(reader);
if ( i == 0 ) {
reporter->Error("Reader not found");
return false;
}
map<int, Manager::Filter*>::iterator it = i->filters.find(filterId);
if ( it == i->filters.end() ) {
reporter->Error("Got RemoveFilterContinuation where filter nonexistant for %d", filterId);
return false;
}
delete (*it).second;
i->filters.erase(it);
return true;
}
}
bool Manager::RemoveEventFilter(EnumVal* id, const string &name) {
ReaderInfo *i = FindReader(id);