Merge branch 'topic/bernhard/input' into topic/bernhard/input-threads

most stuff is inplace, logging framework needs a few changes merged before continuing here...

Conflicts:
	src/CMakeLists.txt
	src/LogMgr.h
	src/logging/Manager.cc
	src/main.cc

src/input/ReaderBackend.h

@@ -0,0 +1,86 @@
+// See the file "COPYING" in the main distribution directory for copyright.
+// 
+// Same notes about thread safety as in LogWriter.h apply.
+
+
+#ifndef INPUT_READERBACKEND_H
+#define INPUT_READERBACKEND_H
+
+#include "InputMgr.h"
+#include "BroString.h"
+#include "LogMgr.h"
+
+namespace input {
+
+class ReaderBackend : public threading::MsgThread {
+public:
+	ReaderBackend(ReaderFrontend *frontend);
+    	
+	virtual ~ReaderBackend();
+	
+	bool Init(string arg_source);
+
+	bool AddFilter( int id, int arg_num_fields, const LogField* const* fields );
+
+	bool RemoveFilter ( int id );
+    
+	void Finish();
+
+	bool Update();
+	
+protected:
+    // Methods that have to be overwritten by the individual readers
+	virtual bool DoInit(string arg_sources) = 0;
+
+	virtual bool DoAddFilter( int id, int arg_num_fields, const LogField* const* fields ) = 0;
+
+	virtual bool DoRemoveFilter( int id ) = 0;
+
+	virtual void DoFinish() = 0;
+
+	// update file contents to logmgr
+	virtual bool DoUpdate() = 0;
+	
+	// Reports an error to the user.
+	void Error(const string &msg);
+	void Error(const char *msg);
+	
+	// The following methods return the information as passed to Init().
+	const string Source() const	{ return source; }
+
+	// A thread-safe version of fmt(). (stolen from logwriter)
+	const char* Fmt(const char* format, ...);
+
+	bool SendEvent(const string& name, const int num_vals, const LogVal* const *vals);
+
+	// Content-sendinf-functions (simple mode). Including table-specific stuff that simply is not used if we have no table
+	void Put(int id, const LogVal* const *val);
+	void Delete(int id, const LogVal* const *val);
+	void Clear(int id);
+
+	// Table-functions (tracking mode): Only changed lines are propagated.
+	void SendEntry(int id, const LogVal* const *vals);
+	void EndCurrentSend(int id);
+	
+
+private:
+	// Frontend that instantiated us. This object must not be access from
+	// this class, it's running in a different thread!
+	ReaderFrontend* frontend;	
+
+	string source;
+    
+    	// When an error occurs, this method is called to set a flag marking the 
+    	// writer as disabled.
+    
+    	bool disabled;
+    	bool Disabled() { return disabled; }
+
+	// For implementing Fmt().
+	char* buf;
+	unsigned int buf_len;    
+};
+
+}
+
+#endif /* INPUT_READERBACKEND_H */