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

tried enum support - doesn't yet work due to internal bro interface problems...

Browse source
This commit is contained in:
Bernhard Amann 2011-11-14 17:18:28 -08:00
parent c8a713da3d
commit 1a642f3568
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/InputMgr.cc
View file

@ -828,6 +828,7 @@ HashKey* InputMgr::HashLogVals(const int num_elements, const LogVal* const *vals
break; break;
case TYPE_STRING: case TYPE_STRING:
case TYPE_ENUM:
{ {
length += val->val.string_val->size(); length += val->val.string_val->size();
break; break;
@ -883,6 +884,7 @@ HashKey* InputMgr::HashLogVals(const int num_elements, const LogVal* const *vals
break; break;
case TYPE_STRING: case TYPE_STRING:
case TYPE_ENUM:
{ {
memcpy(data+position, val->val.string_val->c_str(), val->val.string_val->length()); memcpy(data+position, val->val.string_val->c_str(), val->val.string_val->length());
position += val->val.string_val->size(); position += val->val.string_val->size();
@ -958,6 +960,10 @@ Val* InputMgr::LogValToVal(const LogVal* val, TypeTag request_type) {
return new SubNetVal(val->val.subnet_val.net, val->val.subnet_val.width); return new SubNetVal(val->val.subnet_val.net, val->val.subnet_val.width);
break; break;
case TYPE_ENUM:
reporter->InternalError("Sorry, Enums reading does not yet work, missing internal inferface");
default: default:
reporter->InternalError("unsupported type for input_read"); reporter->InternalError("unsupported type for input_read");
} }

2
src/InputReaderAscii.cc
View file

@ -128,7 +128,6 @@ bool InputReaderAscii::GetLine(string& str) {
// read the entire file and send appropriate thingies back to InputMgr // read the entire file and send appropriate thingies back to InputMgr
bool InputReaderAscii::DoUpdate() { bool InputReaderAscii::DoUpdate() {
// dirty, fix me. (well, apparently after trying seeking, etc - this is not that bad) // dirty, fix me. (well, apparently after trying seeking, etc - this is not that bad)
if ( file && file->is_open() ) { if ( file && file->is_open() ) {
@ -198,6 +197,7 @@ bool InputReaderAscii::DoUpdate() {
//bzero(val, sizeof(LogVal)); //bzero(val, sizeof(LogVal));
switch ( currMapping.type ) { switch ( currMapping.type ) {
case TYPE_ENUM:
case TYPE_STRING: case TYPE_STRING:
val->val.string_val = new string(s); val->val.string_val = new string(s);
break; break;

1
src/input.bif
View file

@ -51,3 +51,4 @@ function Input::__remove_filter%(id: Log::ID, name: string%) : bool
bool res = input_mgr->RemoveFilter(id->AsEnumVal(), name->AsString()->CheckString()); bool res = input_mgr->RemoveFilter(id->AsEnumVal(), name->AsString()->CheckString());
return new Val( res, TYPE_BOOL); return new Val( res, TYPE_BOOL);
%} %}