yay, basic table assignment.

scripts/base/frameworks/input/main.bro

@@ -5,8 +5,8 @@ export {
 	type ReaderDescription: record {
 		source: string;
 		idx: any;
-		val: any &optional;
-		destination: any &optional;
+		val: any;
+		destination: any;
 	};
 }
 

src/InputMgr.cc

@@ -13,6 +13,16 @@
 
 #include "InputReaderAscii.h"
 
+struct InputMgr::ReaderInfo {
+	EnumVal* id;
+	EnumVal* type;
+	InputReader* reader;
+	unsigned int num_idx_fields;
+	unsigned int num_val_fields;
+
+	TableVal* tab;
+
+	};
 
 struct InputReaderDefinition {
 	bro_int_t type; // the type
@@ -30,7 +40,7 @@ InputReaderDefinition input_readers[] = {
 
 InputMgr::InputMgr()
 {
-	DBG_LOG(DBG_LOGGING, "this has to happen");
+	//DBG_LOG(DBG_LOGGING, "this has to happen");
 }
 
 
@@ -93,8 +103,10 @@ InputReader* InputMgr::CreateReader(EnumVal* reader, RecordVal* description)
 	string source((const char*) bsource->Bytes(), bsource->Len());
 
 	RecordType *idx = description->Lookup(rtype->FieldOffset("idx"))->AsType()->AsTypeType()->Type()->AsRecordType();
+	RecordType *val = description->Lookup(rtype->FieldOffset("val"))->AsType()->AsTypeType()->Type()->AsRecordType();
+	TableVal *dst = description->Lookup(rtype->FieldOffset("destination"))->AsTableVal();
 
-	LogField** fields = new LogField*[idx->NumFields()];
+	LogField** fields = new LogField*[idx->NumFields() + val->NumFields()];
 	for ( int i = 0; i < idx->NumFields(); i++ ) 
 	{
 		// FIXME: do type checking...
@@ -103,15 +115,43 @@ InputReader* InputMgr::CreateReader(EnumVal* reader, RecordVal* description)
 		field->type = idx->FieldType(i)->Tag();
 		fields[i] = field;
 	}
+	for ( int i = 0; i < val->NumFields(); i++ ) 
+	{
+		// FIXME: do type checking...
+		LogField* field = new LogField();
+		field->name = val->FieldName(i);
+		field->type = val->FieldType(i)->Tag();
+		fields[idx->NumFields() + i] = field;
+	}
+
+	ReaderInfo* info = new ReaderInfo;
+	info->reader = reader_obj;
+	info->type = reader;
+	info->num_idx_fields = idx->NumFields();
+	info->num_val_fields = val->NumFields();
+	info->tab = dst;
+	readers.push_back(info);
 
 
-	reader_obj->Init(source, idx->NumFields(), fields);
+	reader_obj->Init(source, idx->NumFields() + val->NumFields(), fields);
 	reader_obj->Update();
 	
 	return reader_obj;
 	
 }
 
+void InputMgr::Put(const InputReader* reader, const LogVal* const *vals) {
+	ReaderInfo *i = FindReader(reader);
+	if ( i == 0 ) {
+		reporter->InternalError("Unknown reader");
+		return;
+	}
+
+	i->tab->Assign(LogValToVal(vals[0]), LogValToVal(vals[1]));
+	reporter->Error("assigned");
+}
+
+
 void InputMgr::Error(InputReader* reader, const char* msg)
 {
 	reporter->Error("error with input reader for %s: %s", reader->Source().c_str(), msg);
@@ -172,4 +212,16 @@ Val* InputMgr::LogValToVal(const LogVal* val) {
 	return NULL;
 }
 		
-		
+InputMgr::ReaderInfo* InputMgr::FindReader(const InputReader* reader)
+	{
+	for ( vector<ReaderInfo *>::iterator s = readers.begin(); s != readers.end(); ++s )
+		{
+		if ( (*s)->reader == reader ) 
+		{
+			return *s;
+		}
+		}
+
+	return 0;
+	}
+

src/InputMgr.h

@@ -24,14 +24,18 @@ protected:
 	
 	// Reports an error for the given reader.
 	void Error(InputReader* reader, const char* msg);
+
+	void Put(const InputReader* reader, const LogVal* const *vals);
 	
 private:
-	// required functionality
-	// InputValsToRecord to convert received inputvals back to bro records / tables / whatever
+	struct ReaderInfo;
+
 	Val* LogValToVal(const LogVal* val);
 
 	void SendEvent(const string& name, const int num_vals, const LogVal* const *vals);
+	ReaderInfo* FindReader(const InputReader* reader);
 
+	vector<ReaderInfo*> readers;
 };
 
 extern InputMgr* input_mgr;

src/InputReader.cc

@@ -25,6 +25,11 @@ void InputReader::Error(const string &msg)
 	input_mgr->Error(this, msg.c_str());
 	}
 
+void InputReader::Put(const LogVal* const *val) 
+{
+	input_mgr->Put(this, val);
+}
+
 bool InputReader::Init(string arg_source, int arg_num_fields,
 					   const LogField* const * arg_fields) 
 {

src/InputReader.h

@@ -42,6 +42,8 @@ protected:
 
 	void SendEvent(const string& name, const int num_vals, const LogVal* const *vals);
 
+	void Put(const LogVal* const *val);
+
 private:
     friend class InputMgr;
 	

src/InputReaderAscii.cc

@@ -143,6 +143,21 @@ bool InputReaderAscii::DoUpdate() {
 				val->val.string_val = new string(s);
 				break;
 
+			case TYPE_BOOL:
+			case TYPE_INT:
+				val->val.int_val = atoi(s.c_str());
+				break;
+
+			case TYPE_DOUBLE:
+			case TYPE_TIME:
+			case TYPE_INTERVAL:
+				val->val.double_val = atof(s.c_str());
+				break;
+
+			case TYPE_COUNT:
+				val->val.uint_val = atoi(s.c_str());
+				break;
+
 			default:
 				Error(Fmt("unsupported field format %d for %s", currMapping.type,
 			 	 currMapping.name.c_str()));
@@ -163,6 +178,7 @@ bool InputReaderAscii::DoUpdate() {
 		// for testing purposes: fixed event.
 
 		SendEvent("inputEvent", num_fields, fields);
+		Put(fields);
 
 	}