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

fix some stupid, not that easy to find bugs.

Browse source 
Functionality seems to work completely again - including all tests passing.
This commit is contained in:
Bernhard Amann 2012-03-18 10:50:10 -07:00
parent 3286d013c9
commit bf597012f8
9 changed files with 690 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/input/Manager.cc
View file

@ -837,7 +837,7 @@ int Manager::SendEntryTable(Filter* i, const Value* const *vals) {
Ref(valval);
if ( filter->num_val_fields == 0 ) {
Ref(filter->description);
SendEvent(filter->event, 4, filter->description->Ref(), ev, predidx);
SendEvent(filter->event, 3, filter->description->Ref(), ev, predidx);
} else {
SendEvent(filter->event, 4, filter->description->Ref(), ev, predidx, valval);
}
@ -898,7 +898,7 @@ void Manager::EndCurrentSend(ReaderFrontend* reader) {
Ref(predidx);
Ref(val);
bool result = CallPred(filter->pred, 3, ev, predidx, val);
bool result = CallPred(filter->pred, 4, filter->description->Ref(), ev, predidx, val);
if ( result == false ) {
// Keep it. Hence - we quit and simply go to the next entry of lastDict
@ -943,7 +943,7 @@ void Manager::EndCurrentSend(ReaderFrontend* reader) {
}
SendEvent(handler, 2, new BroString(i->name), new BroString(i->source));
SendEvent(handler, 2, new StringVal(i->name.c_str()), new StringVal(i->source.c_str()));
}
void Manager::Put(ReaderFrontend* reader, Value* *vals) {
@ -1154,7 +1154,7 @@ bool Manager::Delete(ReaderFrontend* reader, Value* *vals) {
int startpos = 0;
Val* predidx = ValueToRecordVal(vals, filter->itype, &startpos);
filterresult = CallPred(filter->pred, 3, ev, predidx, val);
filterresult = CallPred(filter->pred, 4, filter->description->Ref(), ev, predidx, val);
if ( filterresult == false ) {
// keep it.
@ -1170,7 +1170,7 @@ bool Manager::Delete(ReaderFrontend* reader, Value* *vals) {
assert(val != 0);
Ref(val);
EnumVal *ev = new EnumVal(BifEnum::Input::EVENT_REMOVED, BifType::Enum::Input::Event);
SendEvent(filter->event, 3, ev, idxval, val);
SendEvent(filter->event, 4, filter->description->Ref(), ev, idxval, val);
}
}