Begin new beta branch

Merge branch 'master' into beta

Conflicts:
	ChangeLog
	tests/Makefile.am

1 files changed, 49 insertions, 8 deletions

diff --git a/runtime/parser.h b/runtime/parser.h
index cec9c083..c4f63021 100644
--- a/runtime/parser.h
+++ b/runtime/parser.h
@@ -1,8 +1,6 @@
 /* header for parser.c
- * This is not yet an object, but contains all those code necessary to
- * parse syslog messages.
  *
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008,2009 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -21,10 +19,53 @@
  *
  * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
  */
-#ifndef INCLUDED_PARSE_H
-#define INCLUDED_PARSE_H
+#ifndef INCLUDED_PARSER_H
+#define INCLUDED_PARSER_H
 
-extern rsRetVal parserClassInit(void);
-extern rsRetVal parseMsg(msg_t*);
 
-#endif /* #ifndef INCLUDED_PARSE_H */
+/* we create a small helper object, a list of parsers, that we can use to
+ * build a chain of them whereever this is needed (initially thought to be
+ * used in ruleset.c as well as ourselvs).
+ */
+struct parserList_s {
+	parser_t *pParser;
+	parserList_t *pNext;
+};
+
+
+/* the parser object, a dummy because we have only static methods */
+struct parser_s {
+	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
+	uchar *pName;		/* name of this parser */
+	modInfo_t *pModule;	/* pointer to parser's module */
+	bool bDoSanitazion;	/* do standard message sanitazion before calling parser? */
+	bool bDoPRIParsing;	/* do standard PRI parsing before calling parser? */
+};
+
+/* interfaces */
+BEGINinterface(parser) /* name must also be changed in ENDinterface macro! */
+	INTERFACEObjDebugPrint(var);
+	rsRetVal (*Construct)(parser_t **ppThis);
+	rsRetVal (*ConstructFinalize)(parser_t *pThis);
+	rsRetVal (*Destruct)(parser_t **ppThis);
+	rsRetVal (*SetName)(parser_t *pThis, uchar *name);
+	rsRetVal (*SetModPtr)(parser_t *pThis, modInfo_t *pMod);
+	rsRetVal (*SetDoSanitazion)(parser_t *pThis, int);
+	rsRetVal (*SetDoPRIParsing)(parser_t *pThis, int);
+	rsRetVal (*FindParser)(parser_t **ppThis, uchar*name);
+	rsRetVal (*InitParserList)(parserList_t **pListRoot);
+	rsRetVal (*DestructParserList)(parserList_t **pListRoot);
+	rsRetVal (*AddParserToList)(parserList_t **pListRoot, parser_t *pParser);
+	/* static functions */
+	rsRetVal (*ParseMsg)(msg_t *pMsg);
+	rsRetVal (*SanitizeMsg)(msg_t *pMsg);
+	rsRetVal (*AddDfltParser)(uchar *);
+ENDinterface(parser)
+#define parserCURR_IF_VERSION 1 /* increment whenever you change the interface above! */
+
+
+/* prototypes */
+PROTOTYPEObj(parser);
+
+
+#endif /* #ifndef INCLUDED_PARSER_H */