new ruleengine: some cleanup

7 files changed, 4 insertions, 104 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 67e235a0..7af26d2b 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -63,8 +63,6 @@ librsyslog_la_SOURCES = \
 	queue.h \
 	ruleset.c \
 	ruleset.h \
-	rule.c \
-	rule.h \
 	prop.c \
 	prop.h \
 	cfsysline.c \
diff --git a/runtime/conf.c b/runtime/conf.c
index 7ad8f529..8edf02fc 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -61,7 +61,6 @@
 #include "srUtils.h"
 #include "errmsg.h"
 #include "net.h"
-#include "rule.h"
 #include "ruleset.h"
 #include "rsconf.h"
 #include "unicode-helper.h"
@@ -79,7 +78,6 @@ DEFobjStaticHelpers
 DEFobjCurrIf(module)
 DEFobjCurrIf(errmsg)
 DEFobjCurrIf(net)
-DEFobjCurrIf(rule)
 DEFobjCurrIf(ruleset)
 
 int bConfStrictScoping = 0;	/* force strict scoping during config processing? */
@@ -798,7 +796,6 @@ CODESTARTObjClassExit(conf)
 	objRelease(module, CORE_COMPONENT);
 	objRelease(errmsg, CORE_COMPONENT);
 	objRelease(net, LM_NET_FILENAME);
-	objRelease(rule, CORE_COMPONENT);
 	objRelease(ruleset, CORE_COMPONENT);
 ENDObjClassExit(conf)
 
@@ -812,7 +809,6 @@ BEGINAbstractObjClassInit(conf, 1, OBJ_IS_CORE_MODULE) /* class, version - CHANG
 	CHKiRet(objUse(module, CORE_COMPONENT));
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 	CHKiRet(objUse(net, LM_NET_FILENAME)); /* TODO: make this dependcy go away! */
-	CHKiRet(objUse(rule, CORE_COMPONENT));
 	CHKiRet(objUse(ruleset, CORE_COMPONENT));
 
  	/* These commands will NOT be supported -- the new v6.3 config system provides
diff --git a/runtime/rsconf.c b/runtime/rsconf.c
index 5f1980fd..d2bfd5fa 100644
--- a/runtime/rsconf.c
+++ b/runtime/rsconf.c
@@ -36,7 +36,6 @@
 #include "rsyslog.h"
 #include "obj.h"
 #include "srUtils.h"
-#include "rule.h"
 #include "ruleset.h"
 #include "modules.h"
 #include "conf.h"
@@ -70,7 +69,6 @@
 
 /* static data */
 DEFobjStaticHelpers
-DEFobjCurrIf(rule)
 DEFobjCurrIf(ruleset)
 DEFobjCurrIf(module)
 DEFobjCurrIf(conf)
@@ -242,40 +240,6 @@ CODESTARTobjDebugPrint(rsconf)
 ENDobjDebugPrint(rsconf)
 
 
-rsRetVal
-cnfDoActlst(struct cnfactlst *actlst, rule_t *pRule)
-{
-	struct cnfcfsyslinelst *cflst;
-	action_t *pAction;
-	uchar *str;
-	DEFiRet;
-
-	while(actlst != NULL) {
-		dbgprintf("aclst %p: ", actlst);
-		if(actlst->actType == CNFACT_V2) {
-			dbgprintf("v6+ action object\n");
-			if(actionNewInst(actlst->data.lst, &pAction) == RS_RET_OK) {
-				iRet = llAppend(&(pRule)->llActList,  NULL, (void*) pAction);
-			} else {
-				errmsg.LogError(0, RS_RET_ERR, "errors occured in file '%s' "
-					"around line %d", actlst->cnfFile, actlst->lineno);
-			}
-		} else {
-			dbgprintf("legacy action line:%s\n", actlst->data.legActLine);
-			str = (uchar*) actlst->data.legActLine;
-			CHKiRet(cflineDoAction(loadConf, &str, &pAction));
-			iRet = llAppend(&(pRule)->llActList,  NULL, (void*) pAction);
-		}
-		for(  cflst = actlst->syslines
-		    ; cflst != NULL ; cflst = cflst->next) {
-			 cnfDoCfsysline(cflst->line);
-		}
-		actlst = actlst->next;
-	}
-finalize_it:
-	RETiRet;
-}
-
 /* This function returns the current date in different
  * variants. It is used to construct the $NOW series of
  * system properties. The returned buffer must be freed
@@ -1370,7 +1334,6 @@ ENDobjQueryInterface(rsconf)
 BEGINObjClassInit(rsconf, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	/* request objects we use */
 	CHKiRet(objUse(ruleset, CORE_COMPONENT));
-	CHKiRet(objUse(rule, CORE_COMPONENT));
 	CHKiRet(objUse(module, CORE_COMPONENT));
 	CHKiRet(objUse(conf, CORE_COMPONENT));
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
@@ -1387,7 +1350,6 @@ ENDObjClassInit(rsconf)
 /* De-initialize the rsconf class.
  */
 BEGINObjClassExit(rsconf, OBJ_IS_CORE_MODULE) /* class, version */
-	objRelease(rule, CORE_COMPONENT);
 	objRelease(ruleset, CORE_COMPONENT);
 	objRelease(module, CORE_COMPONENT);
 	objRelease(conf, CORE_COMPONENT);
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c
index cbab06b7..73d3bd43 100644
--- a/runtime/rsyslog.c
+++ b/runtime/rsyslog.c
@@ -171,8 +171,6 @@ rsrtInit(char **ppErrObj, obj_if_t *pObjIF)
 		CHKiRet(glblClassInit(NULL));
 		if(ppErrObj != NULL) *ppErrObj = "msg";
 		CHKiRet(msgClassInit(NULL));
-		if(ppErrObj != NULL) *ppErrObj = "rule";
-		CHKiRet(ruleClassInit(NULL));
 		if(ppErrObj != NULL) *ppErrObj = "ruleset";
 		CHKiRet(rulesetClassInit(NULL));
 		if(ppErrObj != NULL) *ppErrObj = "wti";
@@ -220,7 +218,6 @@ rsrtExit(void)
 		confClassExit();
 		glblClassExit();
 		rulesetClassExit();
-		ruleClassExit();
 
 		objClassExit(); /* *THIS* *MUST/SHOULD?* always be the first class initilizer being called (except debug)! */
 	}
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index 45520451..f09bebdd 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -136,23 +136,6 @@ finalize_it:
 }
 
 
-
-/* helper to processBatch(), used to call the configured actions. It is
- * executed from within llExecFunc() of the action list.
- * rgerhards, 2007-08-02
- */
-DEFFUNC_llExecFunc(processBatchDoRules)
-{
-	rsRetVal iRet;
-	ISOBJ_TYPE_assert(pData, rule);
-	DBGPRINTF("Processing next rule\n");
-	iRet = rule.ProcessBatch((rule_t*) pData, (batch_t*) pParam);
-	DBGPRINTF("ruleset: get iRet %d from rule.ProcessMsg()\n", iRet);
-	return iRet;
-}
-
-
-
 /* This function is similar to processBatch(), but works on a batch that
  * contains rules from multiple rulesets. In this case, we can not push
  * the whole batch through the ruleset. Instead, we examine it and
@@ -536,31 +519,6 @@ dbgprintf("RRRR: ruleset added script, script total now is:\n");
 	cnfstmtPrint(pThis->root, 0);
 }
 
-/* Add a new rule to the end of the current rule set. We do a number
- * of checks and ignore the rule if it does not pass them.
- */
-static rsRetVal
-addRule(ruleset_t *pThis, rule_t **ppRule)
-{
-	int iActionCnt;
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, ruleset);
-	ISOBJ_TYPE_assert(*ppRule, rule);
-
-	CHKiRet(llGetNumElts(&(*ppRule)->llActList, &iActionCnt));
-	if(iActionCnt == 0) {
-		errmsg.LogError(0, NO_ERRCODE, "warning: selector line without actions will be discarded");
-		rule.Destruct(ppRule);
-	} else {
-		CHKiRet(llAppend(&pThis->llRules, NULL, *ppRule));
-		DBGPRINTF("selector line successfully processed, %d actions\n", iActionCnt);
-	}
-
-finalize_it:
-	RETiRet;
-}
-
 
 /* set name for ruleset */
 static rsRetVal setName(ruleset_t *pThis, uchar *pszName)
@@ -747,16 +705,11 @@ rulesetDestructForLinkedList(void *pData)
 	return rulesetDestruct(&pThis);
 }
 
-/* helper for debugPrint(), initiates rule printing */
-DEFFUNC_llExecFunc(doDebugPrintRule)
-{
-	return rule.DebugPrint((rule_t*) pData);
-}
 /* debugprint for the ruleset object */
 BEGINobjDebugPrint(ruleset) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDebugPrint(ruleset)
 	dbgoprint((obj_t*) pThis, "rsyslog ruleset %s:\n", pThis->pszName);
-	llExecFunc(&pThis->llRules, doDebugPrintRule, NULL);
+	cnfstmtPrint(pThis->root, 0);
 ENDobjDebugPrint(ruleset)
 
 
@@ -886,7 +839,6 @@ CODESTARTobjQueryInterface(ruleset)
 
 	pIf->IterateAllActions = iterateAllActions;
 	pIf->DestructAllActions = destructAllActions;
-	pIf->AddRule = addRule;
 	pIf->AddScript = addScript;
 	pIf->ProcessBatch = processBatch;
 	pIf->SetName = setName;
@@ -918,7 +870,7 @@ ENDObjClassExit(ruleset)
 BEGINObjClassInit(ruleset, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-	CHKiRet(objUse(rule, CORE_COMPONENT));
+//TODO:finally delete!	CHKiRet(objUse(rule, CORE_COMPONENT));
 
 	/* set our own handlers */
 	OBJSetMethodHandler(objMethod_DEBUGPRINT, rulesetDebugPrint);
diff --git a/runtime/ruleset.h b/runtime/ruleset.h
index cc0c7a06..1a903aee 100644
--- a/runtime/ruleset.h
+++ b/runtime/ruleset.h
@@ -44,9 +44,7 @@ BEGINinterface(ruleset) /* name must also be changed in ENDinterface macro! */
 	rsRetVal (*Construct)(ruleset_t **ppThis);
 	rsRetVal (*ConstructFinalize)(rsconf_t *conf, ruleset_t __attribute__((unused)) *pThis);
 	rsRetVal (*Destruct)(ruleset_t **ppThis);
-	rsRetVal (*IterateAllActions)(rsconf_t *conf, rsRetVal (*pFunc)(void*, void*), void* pParam);
 	rsRetVal (*DestructAllActions)(rsconf_t *conf);
-	rsRetVal (*AddRule)(ruleset_t *pThis, rule_t **ppRule);
 	rsRetVal (*SetName)(ruleset_t *pThis, uchar *pszName);
 	rsRetVal (*ProcessBatch)(batch_t*);
 	rsRetVal (*GetRuleset)(rsconf_t *conf, ruleset_t **ppThis, uchar*);
@@ -63,6 +61,8 @@ BEGINinterface(ruleset) /* name must also be changed in ENDinterface macro! */
 	 * system uses globals in any case.
 	 */
 	/* v7, 2012-09-04 */
+	/* AddRule() removed */
+	/*TODO:REMOVE*/rsRetVal (*IterateAllActions)(rsconf_t *conf, rsRetVal (*pFunc)(void*, void*), void* pParam);
 	void (*AddScript)(ruleset_t *pThis, struct cnfstmt *script);
 ENDinterface(ruleset)
 #define rulesetCURR_IF_VERSION 7 /* increment whenever you change the interface structure! */
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 219b41ab..a30fb464 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -119,7 +119,6 @@
 #include "batch.h"
 #include "unicode-helper.h"
 #include "ruleset.h"
-#include "rule.h"
 #include "net.h"
 #include "prop.h"
 #include "rsconf.h"
@@ -134,7 +133,6 @@ DEFobjCurrIf(datetime) /* TODO: make go away! */
 DEFobjCurrIf(conf)
 DEFobjCurrIf(module)
 DEFobjCurrIf(errmsg)
-DEFobjCurrIf(rule)
 DEFobjCurrIf(ruleset)
 DEFobjCurrIf(prop)
 DEFobjCurrIf(parser)
@@ -1453,8 +1451,6 @@ InitGlobalClasses(void)
 	CHKiRet(objUse(module,   CORE_COMPONENT));
 	pErrObj = "datetime";
 	CHKiRet(objUse(datetime, CORE_COMPONENT));
-	pErrObj = "rule";
-	CHKiRet(objUse(rule,     CORE_COMPONENT));
 	pErrObj = "ruleset";
 	CHKiRet(objUse(ruleset,  CORE_COMPONENT));
 	pErrObj = "conf";
@@ -1508,7 +1504,6 @@ GlobalClassExit(void)
 	objRelease(prop,     CORE_COMPONENT);
 	objRelease(conf,     CORE_COMPONENT);
 	objRelease(ruleset,  CORE_COMPONENT);
-	objRelease(rule,     CORE_COMPONENT);
 	parserClassExit();					/* this is hack, currently core_modules do not get this automatically called */
 	rsconfClassExit();					/* this is hack, currently core_modules do not get this automatically called */
 	objRelease(datetime, CORE_COMPONENT);