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

switch to set if record or simple value is desired.

Browse source
This commit is contained in:
Bernhard Amann 2011-11-15 08:36:03 -08:00
parent 1a642f3568
commit cde8153c18
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/base/frameworks/input/main.bro
View file

@ -9,6 +9,7 @@ export {
idx: any; idx: any;
val: any; val: any;
destination: any; destination: any;
want_record: bool &default=T;
reader: Reader &default=default_reader; reader: Reader &default=default_reader;
}; };

14
src/InputMgr.cc
View file

@ -42,6 +42,7 @@ struct InputMgr::ReaderInfo {
InputReader* reader; InputReader* reader;
unsigned int num_idx_fields; unsigned int num_idx_fields;
unsigned int num_val_fields; unsigned int num_val_fields;
bool want_record;
TableVal* tab; TableVal* tab;
RecordType* rtype; RecordType* rtype;
@ -147,6 +148,7 @@ InputReader* InputMgr::CreateReader(EnumVal* id, RecordVal* description)
RecordType *idx = description->Lookup(rtype->FieldOffset("idx"))->AsType()->AsTypeType()->Type()->AsRecordType(); RecordType *idx = description->Lookup(rtype->FieldOffset("idx"))->AsType()->AsTypeType()->Type()->AsRecordType();
RecordType *val = description->Lookup(rtype->FieldOffset("val"))->AsType()->AsTypeType()->Type()->AsRecordType(); RecordType *val = description->Lookup(rtype->FieldOffset("val"))->AsType()->AsTypeType()->Type()->AsRecordType();
TableVal *dst = description->Lookup(rtype->FieldOffset("destination"))->AsTableVal(); TableVal *dst = description->Lookup(rtype->FieldOffset("destination"))->AsTableVal();
Val *want_record = description->Lookup(rtype->FieldOffset("want_record"));
vector<LogField*> fieldsV; // vector, because we don't know the length beforehands vector<LogField*> fieldsV; // vector, because we don't know the length beforehands
@ -181,6 +183,11 @@ InputReader* InputMgr::CreateReader(EnumVal* id, RecordVal* description)
info->itype = idx->Ref()->AsRecordType(); info->itype = idx->Ref()->AsRecordType();
info->currDict = new PDict(InputHash); info->currDict = new PDict(InputHash);
info->lastDict = new PDict(InputHash); info->lastDict = new PDict(InputHash);
info->want_record = ( want_record->InternalInt() == 1 );
if ( valfields > 1 ) {
assert(info->want_record);
}
readers.push_back(info); readers.push_back(info);
@ -311,7 +318,6 @@ bool InputMgr::UnrollRecordType(vector<LogField*> *fields, const RecordType *rec
if ( rec->FieldType(i)->Tag() == TYPE_RECORD ) if ( rec->FieldType(i)->Tag() == TYPE_RECORD )
{ {
string prep = nameprepend + rec->FieldName(i) + "."; string prep = nameprepend + rec->FieldName(i) + ".";
if ( !UnrollRecordType(fields, rec->FieldType(i)->AsRecordType(), prep) ) if ( !UnrollRecordType(fields, rec->FieldType(i)->AsRecordType(), prep) )
@ -464,7 +470,7 @@ void InputMgr::SendEntry(const InputReader* reader, const LogVal* const *vals) {
Val* valval; Val* valval;
int position = i->num_idx_fields; int position = i->num_idx_fields;
if ( i->num_val_fields == 1 ) { if ( i->num_val_fields == 1 && !i->want_record ) {
valval = LogValToVal(vals[i->num_idx_fields]); valval = LogValToVal(vals[i->num_idx_fields]);
} else { } else {
RecordVal * r = new RecordVal(i->rtype); RecordVal * r = new RecordVal(i->rtype);
@ -683,7 +689,7 @@ void InputMgr::Put(const InputReader* reader, const LogVal* const *vals) {
Val* valval; Val* valval;
int position = i->num_idx_fields; int position = i->num_idx_fields;
if ( i->num_val_fields == 1 ) { if ( i->num_val_fields == 1 && !i->want_record ) {
valval = LogValToVal(vals[i->num_idx_fields]); valval = LogValToVal(vals[i->num_idx_fields]);
} else { } else {
RecordVal * r = new RecordVal(i->rtype); RecordVal * r = new RecordVal(i->rtype);
@ -961,7 +967,7 @@ Val* InputMgr::LogValToVal(const LogVal* val, TypeTag request_type) {
break; break;
case TYPE_ENUM: case TYPE_ENUM:
reporter->InternalError("Sorry, Enums reading does not yet work, missing internal inferface"); reporter->InternalError("Sorry, Enum reading does not yet work, missing internal inferface");
default: default: