milestone: ruleset now supports rsconf_t

14 files changed, 100 insertions, 80 deletions

diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 37d3136c..67eebefe 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -543,7 +543,7 @@ setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.GetRuleset(&pRuleset, pszName);
+	localRet = ruleset.GetRuleset(ourConf, &pRuleset, pszName);
 	if(localRet == RS_RET_NOT_FOUND) {
 		errmsg.LogError(0, NO_ERRCODE, "error: ruleset '%s' not found - ignored", pszName);
 	}
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
index 33277148..1c9450c2 100644
--- a/plugins/imptcp/imptcp.c
+++ b/plugins/imptcp/imptcp.c
@@ -856,7 +856,7 @@ static rsRetVal setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.GetRuleset(&pRuleset, pszName);
+	localRet = ruleset.GetRuleset(ourConf, &pRuleset, pszName);
 	if(localRet == RS_RET_NOT_FOUND) {
 		errmsg.LogError(0, NO_ERRCODE, "error: ruleset '%s' not found - ignored", pszName);
 	}
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index 24c0cd7e..be95d287 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -172,7 +172,7 @@ static rsRetVal setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.GetRuleset(&pRuleset, pszName);
+	localRet = ruleset.GetRuleset(ourConf, &pRuleset, pszName);
 	if(localRet == RS_RET_NOT_FOUND) {
 		errmsg.LogError(0, RS_RET_RULESET_NOT_FOUND, "error: ruleset '%s' not found - ignored", pszName);
 	}
diff --git a/plugins/imttcp/imttcp.c b/plugins/imttcp/imttcp.c
index 68574ad6..44dc3267 100644
--- a/plugins/imttcp/imttcp.c
+++ b/plugins/imttcp/imttcp.c
@@ -808,7 +808,7 @@ static rsRetVal setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.GetRuleset(&pRuleset, pszName);
+	localRet = ruleset.GetRuleset(ourConf, &pRuleset, pszName);
 	if(localRet == RS_RET_NOT_FOUND) {
 		errmsg.LogError(0, NO_ERRCODE, "error: ruleset '%s' not found - ignored", pszName);
 	}
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index 2b38769e..8a463320 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -265,7 +265,7 @@ setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.GetRuleset(&pRuleset, pszName);
+	localRet = ruleset.GetRuleset(ourConf, &pRuleset, pszName);
 	if(localRet == RS_RET_NOT_FOUND) {
 		errmsg.LogError(0, NO_ERRCODE, "error: ruleset '%s' not found - ignored", pszName);
 	}
diff --git a/plugins/omruleset/omruleset.c b/plugins/omruleset/omruleset.c
index 365b405d..bb140764 100644
--- a/plugins/omruleset/omruleset.c
+++ b/plugins/omruleset/omruleset.c
@@ -131,7 +131,7 @@ setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.GetRuleset(&cs.pRuleset, pszName);
+	localRet = ruleset.GetRuleset(ourConf, &cs.pRuleset, pszName);
 	if(localRet == RS_RET_NOT_FOUND) {
 		errmsg.LogError(0, RS_RET_RULESET_NOT_FOUND, "error: ruleset '%s' not found - ignored", pszName);
 	}
diff --git a/runtime/conf.c b/runtime/conf.c
index 9f4015fd..90b1b487 100644
--- a/runtime/conf.c
+++ b/runtime/conf.c
@@ -70,6 +70,7 @@
 #include "ctok_token.h"
 #include "rule.h"
 #include "ruleset.h"
+#include "rsconf.h"
 #include "unicode-helper.h"
 
 #ifdef OS_SOLARIS
@@ -96,8 +97,6 @@ ecslConfObjType currConfObj = eConfObjGlobal; /* to support scoping - which conf
 int bConfStrictScoping = 0;	/* force strict scoping during config processing? */
 
 
-static int iNbrActions = 0; /* number of currently defined actions */
-
 /* The following module-global variables are used for building
  * tag and host selector lines during startup and config reload.
  * This is stored as a global variable pool because of its ease. It is
@@ -479,7 +478,7 @@ processConfFile(rsconf_t *conf, uchar *pConfFile)
 
 	/* we probably have one selector left to be added - so let's do that now */
 	if(pCurrRule != NULL) {
-		CHKiRet(ruleset.AddRule(rule.GetAssRuleset(pCurrRule), &pCurrRule));
+		CHKiRet(ruleset.AddRule(conf, rule.GetAssRuleset(pCurrRule), &pCurrRule));
 	}
 
 	/* close the configuration file */
@@ -1095,7 +1094,7 @@ finalize_it:
 /* process the action part of a selector line
  * rgerhards, 2007-08-01
  */
-static rsRetVal cflineDoAction(uchar **p, action_t **ppAction)
+static rsRetVal cflineDoAction(rsconf_t *conf, uchar **p, action_t **ppAction)
 {
 	DEFiRet;
 	modInfo_t *pMod;
@@ -1132,7 +1131,7 @@ static rsRetVal cflineDoAction(uchar **p, action_t **ppAction)
 					pAction->f_ReduceRepeated = 0;
 				}
 				pAction->eState = ACT_STATE_RDY; /* action is enabled */
-				iNbrActions++;	/* one more active action! */
+				conf->actions.nbrActions++;	/* one more active action! */
 			}
 			break;
 		}
@@ -1182,7 +1181,7 @@ cflineClassic(rsconf_t *conf, uchar *p, rule_t **ppRule)
 		 * all.  -- rgerhards, 2007-08-01
 		 */
 		if(*ppRule != NULL) {
-			CHKiRet(ruleset.AddRule(rule.GetAssRuleset(*ppRule), ppRule));
+			CHKiRet(ruleset.AddRule(conf, rule.GetAssRuleset(*ppRule), ppRule));
 		}
 		CHKiRet(rule.Construct(ppRule)); /* create "fresh" selector */
 		CHKiRet(rule.SetAssRuleset(*ppRule, ruleset.GetCurrent())); /* create "fresh" selector */
@@ -1190,7 +1189,7 @@ cflineClassic(rsconf_t *conf, uchar *p, rule_t **ppRule)
 		CHKiRet(cflineDoFilter(&p, *ppRule)); /* pull filters */
 	}
 
-	CHKiRet(cflineDoAction(&p, &pAction));
+	CHKiRet(cflineDoAction(conf, &p, &pAction));
 	CHKiRet(llAppend(&(*ppRule)->llActList,  NULL, (void*) pAction));
 
 finalize_it:
@@ -1241,7 +1240,7 @@ GetNbrActActions(rsconf_t *conf, int *piNbrActions)
 {
 	DEFiRet;
 	assert(piNbrActions != NULL);
-	*piNbrActions = iNbrActions;
+	*piNbrActions = conf->actions.nbrActions;
 	RETiRet;
 }
 
diff --git a/runtime/rsconf.c b/runtime/rsconf.c
index be780251..27d89fb6 100644
--- a/runtime/rsconf.c
+++ b/runtime/rsconf.c
@@ -27,10 +27,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <string.h>
 
 #include "rsyslog.h"
 #include "obj.h"
 #include "srUtils.h"
+#include "ruleset.h"
 #include "rsconf.h"
 
 /* static data */
@@ -40,6 +42,12 @@ DEFobjStaticHelpers
 /* Standard-Constructor
  */
 BEGINobjConstruct(rsconf) /* be sure to specify the object type also in END macro! */
+	pThis->templates.root = NULL;
+	pThis->templates.last = NULL;
+	pThis->templates.lastStatic = NULL;
+	pThis->actions.nbrActions = 0;
+	CHKiRet(llInit(&pThis->rulesets.llRulesets, rulesetDestructForLinkedList, rulesetKeyDestruct, strcasecmp));
+finalize_it:
 ENDobjConstruct(rsconf)
 
 
@@ -57,9 +65,7 @@ rsRetVal rsconfConstructFinalize(rsconf_t __attribute__((unused)) *pThis)
 /* destructor for the rsconf object */
 BEGINobjDestruct(rsconf) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(rsconf)
-	pThis->templates.root = NULL;
-	pThis->templates.last = NULL;
-	pThis->templates.lastStatic = NULL;
+	llDestroy(&(pThis->rulesets.llRulesets));
 ENDobjDestruct(rsconf)
 
 
diff --git a/runtime/rsconf.h b/runtime/rsconf.h
index e32e3d12..4fd160a4 100644
--- a/runtime/rsconf.h
+++ b/runtime/rsconf.h
@@ -23,6 +23,8 @@
 #ifndef INCLUDED_RSCONF_H
 #define INCLUDED_RSCONF_H
 
+#include "linkedlist.h"
+
 /* --- configuration objects (the plan is to have ALL upper layers in this file) --- */
 
 /* the following structure is a container for all known templates
@@ -39,6 +41,12 @@ struct actions_s {
 	unsigned nbrActions;		/* number of actions */
 };
 
+
+struct rulesets_s {
+	linkedList_t llRulesets; /* this is NOT a pointer - no typo here ;) */
+};
+
+
 /* --- end configuration objects --- */
 
 /* the rsconf object */
@@ -46,6 +54,7 @@ struct rsconf_s {
 	BEGINobjInstance;	/* Data to implement generic object - MUST be the first data element! */
 	templates_t templates;
 	actions_t actions;
+	rulesets_t rulesets;
 };
 
 
diff --git a/runtime/rule.c b/runtime/rule.c
index 7c3e5131..d023bcec 100644
--- a/runtime/rule.c
+++ b/runtime/rule.c
@@ -4,7 +4,7 @@
  *
  * Module begun 2009-06-10 by Rainer Gerhards
  *
- * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2009-2011 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
index 2d4f113e..71fd76da 100644
--- a/runtime/ruleset.c
+++ b/runtime/ruleset.c
@@ -1,7 +1,7 @@
 /* ruleset.c - rsyslog's ruleset object
  *
- * We have a two-way structure of linked lists: one global linked list
- * (llAllRulesets) hold alls rule sets that we know. Included in each
+ * We have a two-way structure of linked lists: one config-specifc linked list
+ * (conf->rulesets.llRulesets) hold alls rule sets that we know. Included in each
  * list is a list of rules (which contain a list of actions, but that's
  * a different story).
  *
@@ -11,7 +11,7 @@
  *
  * Module begun 2009-06-10 by Rainer Gerhards
  *
- * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2009-2011 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -34,7 +34,7 @@
 
 #include "config.h"
 #include <stdlib.h>
-#include <string.h>
+////#include <string.h>
 #include <assert.h>
 #include <ctype.h>
 
@@ -48,6 +48,7 @@
 #include "parser.h"
 #include "batch.h"
 #include "unicode-helper.h"
+#include "rsconf.h"
 #include "dirty.h" /* for main ruleset queue creation */
 
 /* static data */
@@ -56,26 +57,26 @@ DEFobjCurrIf(errmsg)
 DEFobjCurrIf(rule)
 DEFobjCurrIf(parser)
 
-linkedList_t llRulesets; /* this is NOT a pointer - no typo here ;) */
 ruleset_t *pCurrRuleset = NULL; /* currently "active" ruleset */
 ruleset_t *pDfltRuleset = NULL; /* current default ruleset, e.g. for binding to actions which have no other */
 
 /* forward definitions */
 static rsRetVal processBatch(batch_t *pBatch);
 
-/* ---------- linked-list key handling functions ---------- */
+
+/* ---------- linked-list key handling functions (ruleset) ---------- */
 
 /* destructor for linked list keys.
  */
-static rsRetVal keyDestruct(void __attribute__((unused)) *pData)
+rsRetVal
+rulesetKeyDestruct(void __attribute__((unused)) *pData)
 {
 	free(pData);
 	return RS_RET_OK;
 }
+/* ---------- END linked-list key handling functions (ruleset) ---------- */
 
 
-/* ---------- END linked-list key handling functions ---------- */
-
 
 /* driver to iterate over all of this ruleset actions */
 typedef struct iterateAllActions_s {
@@ -122,7 +123,7 @@ DEFFUNC_llExecFunc(doIterateAllActions)
  * must be done or a shutdown is pending.
  */
 static rsRetVal
-iterateAllActions(rsRetVal (*pFunc)(void*, void*), void* pParam)
+iterateAllActions(rsconf_t *conf, rsRetVal (*pFunc)(void*, void*), void* pParam)
 {
 	iterateAllActions_t params;
 	DEFiRet;
@@ -130,7 +131,7 @@ iterateAllActions(rsRetVal (*pFunc)(void*, void*), void* pParam)
 
 	params.pFunc = pFunc;
 	params.pParam = pParam;
-	CHKiRet(llExecFunc(&llRulesets, doIterateAllActions, &params));
+	CHKiRet(llExecFunc(&(conf->rulesets.llRulesets), doIterateAllActions, &params));
 
 finalize_it:
 	RETiRet;
@@ -255,7 +256,7 @@ GetParserList(msg_t *pMsg)
  * of checks and ignore the rule if it does not pass them.
  */
 static rsRetVal
-addRule(ruleset_t *pThis, rule_t **ppRule)
+addRule(rsconf_t *conf, ruleset_t *pThis, rule_t **ppRule)
 {
 	int iActionCnt;
 	DEFiRet;
@@ -278,7 +279,7 @@ finalize_it:
 
 
 /* set name for ruleset */
-static rsRetVal setName(ruleset_t *pThis, uchar *pszName)
+static rsRetVal setName(rsconf_t *conf, ruleset_t *pThis, uchar *pszName)
 {
 	DEFiRet;
 	free(pThis->pszName);
@@ -316,13 +317,13 @@ GetRulesetQueue(ruleset_t *pThis)
 /* Find the ruleset with the given name and return a pointer to its object.
  */
 static rsRetVal
-GetRuleset(ruleset_t **ppRuleset, uchar *pszName)
+GetRuleset(rsconf_t *conf, ruleset_t **ppRuleset, uchar *pszName)
 {
 	DEFiRet;
 	assert(ppRuleset != NULL);
 	assert(pszName != NULL);
 
-	CHKiRet(llFind(&llRulesets, pszName, (void*) ppRuleset));
+	CHKiRet(llFind(&(conf->rulesets.llRulesets), pszName, (void*) ppRuleset));
 
 finalize_it:
 	RETiRet;
@@ -332,13 +333,13 @@ finalize_it:
 /* Set a new default rule set. If the default can not be found, no change happens.
  */
 static rsRetVal
-SetDefaultRuleset(uchar *pszName)
+SetDefaultRuleset(rsconf_t *conf, uchar *pszName)
 {
 	ruleset_t *pRuleset;
 	DEFiRet;
 	assert(pszName != NULL);
 
-	CHKiRet(GetRuleset(&pRuleset, pszName));
+	CHKiRet(GetRuleset(conf, &pRuleset, pszName));
 	pDfltRuleset = pRuleset;
 	dbgprintf("default rule set changed to %p: '%s'\n", pRuleset, pszName);
 
@@ -350,13 +351,13 @@ finalize_it:
 /* Set a new current rule set. If the ruleset can not be found, no change happens.
  */
 static rsRetVal
-SetCurrRuleset(uchar *pszName)
+SetCurrRuleset(rsconf_t *conf, uchar *pszName)
 {
 	ruleset_t *pRuleset;
 	DEFiRet;
 	assert(pszName != NULL);
 
-	CHKiRet(GetRuleset(&pRuleset, pszName));
+	CHKiRet(GetRuleset(conf, &pRuleset, pszName));
 	pCurrRuleset = pRuleset;
 	dbgprintf("current rule set changed to %p: '%s'\n", pRuleset, pszName);
 
@@ -389,7 +390,7 @@ ENDobjConstruct(ruleset)
  * This also adds the rule set to the list of all known rulesets.
  */
 static rsRetVal
-rulesetConstructFinalize(ruleset_t *pThis)
+rulesetConstructFinalize(rsconf_t *conf, ruleset_t *pThis)
 {
 	uchar *keyName;
 	DEFiRet;
@@ -400,7 +401,7 @@ rulesetConstructFinalize(ruleset_t *pThis)
 	 * two separate copies.
 	 */
 	CHKmalloc(keyName = ustrdup(pThis->pszName));
-	CHKiRet(llAppend(&llRulesets, keyName, pThis));
+	CHKiRet(llAppend(&(conf->rulesets.llRulesets), keyName, pThis));
 
 	/* this now also is the new current ruleset */
 	pCurrRuleset = pThis;
@@ -428,17 +429,6 @@ CODESTARTobjDestruct(ruleset)
 	free(pThis->pszName);
 ENDobjDestruct(ruleset)
 
-/* this is a special destructor for the linkedList class. LinkedList does NOT
- * provide a pointer to the pointer, but rather the raw pointer itself. So we 
- * must map this, otherwise the destructor will abort.
- */
-static rsRetVal
-rulesetDestructForLinkedList(void *pData)
-{
-	ruleset_t *pThis = (ruleset_t*) pData;
-	return rulesetDestruct(&pThis);
-}
-
 
 /* destruct ALL rule sets that reside in the system. This must
  * be callable before unloading this module as the module may
@@ -447,18 +437,29 @@ rulesetDestructForLinkedList(void *pData)
  * everything runs stable again. -- rgerhards, 2009-06-10
  */
 static rsRetVal
-destructAllActions(void)
+destructAllActions(rsconf_t *conf)
 {
 	DEFiRet;
 
-	CHKiRet(llDestroy(&llRulesets));
-	CHKiRet(llInit(&llRulesets, rulesetDestructForLinkedList, keyDestruct, strcasecmp));
+	CHKiRet(llDestroy(&(conf->rulesets.llRulesets)));
+	CHKiRet(llInit(&(conf->rulesets.llRulesets), rulesetDestructForLinkedList, rulesetKeyDestruct, strcasecmp));
 	pDfltRuleset = NULL;
 
 finalize_it:
 	RETiRet;
 }
 
+/* this is a special destructor for the linkedList class. LinkedList does NOT
+ * provide a pointer to the pointer, but rather the raw pointer itself. So we 
+ * must map this, otherwise the destructor will abort.
+ */
+rsRetVal
+rulesetDestructForLinkedList(void *pData)
+{
+	ruleset_t *pThis = (ruleset_t*) pData;
+	return rulesetDestruct(&pThis);
+}
+
 /* helper for debugPrint(), initiates rule printing */
 DEFFUNC_llExecFunc(doDebugPrintRule)
 {
@@ -480,11 +481,11 @@ DEFFUNC_llExecFunc(doDebugPrintAll)
 /* debug print all rulesets
  */
 static rsRetVal
-debugPrintAll(void)
+debugPrintAll(rsconf_t *conf)
 {
 	DEFiRet;
 	dbgprintf("All Rulesets:\n");
-	llExecFunc(&llRulesets, doDebugPrintAll, NULL);
+	llExecFunc(&(conf->rulesets.llRulesets), doDebugPrintAll, NULL);
 	dbgprintf("End of Rulesets.\n");
 	RETiRet;
 }
@@ -604,7 +605,6 @@ ENDobjQueryInterface(ruleset)
  * rgerhards, 2009-04-06
  */
 BEGINObjClassExit(ruleset, OBJ_IS_CORE_MODULE) /* class, version */
-	llDestroy(&llRulesets);
 	objRelease(errmsg, CORE_COMPONENT);
 	objRelease(rule, CORE_COMPONENT);
 	objRelease(parser, CORE_COMPONENT);
@@ -624,9 +624,6 @@ BEGINObjClassInit(ruleset, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	OBJSetMethodHandler(objMethod_DEBUGPRINT, rulesetDebugPrint);
 	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, rulesetConstructFinalize);
 
-	/* prepare global data */
-	CHKiRet(llInit(&llRulesets, rulesetDestructForLinkedList, keyDestruct, strcasecmp));
-
 	/* config file handlers */
 	CHKiRet(regCfSysLineHdlr((uchar *)"rulesetparser", 0, eCmdHdlrGetWord, rulesetAddParser, NULL, NULL, eConfObjGlobal));
 	CHKiRet(regCfSysLineHdlr((uchar *)"rulesetcreatemainqueue", 0, eCmdHdlrBinary, rulesetCreateQueue, NULL, NULL, eConfObjGlobal));
diff --git a/runtime/ruleset.h b/runtime/ruleset.h
index acebd17a..ab60ee07 100644
--- a/runtime/ruleset.h
+++ b/runtime/ruleset.h
@@ -40,27 +40,35 @@ struct ruleset_s {
 /* interfaces */
 BEGINinterface(ruleset) /* name must also be changed in ENDinterface macro! */
 	INTERFACEObjDebugPrint(ruleset);
-	rsRetVal (*DebugPrintAll)(void);
+	rsRetVal (*DebugPrintAll)(rsconf_t *conf);
 	rsRetVal (*Construct)(ruleset_t **ppThis);
-	rsRetVal (*ConstructFinalize)(ruleset_t __attribute__((unused)) *pThis);
+	rsRetVal (*ConstructFinalize)(rsconf_t *conf, ruleset_t __attribute__((unused)) *pThis);
 	rsRetVal (*Destruct)(ruleset_t **ppThis);
-	rsRetVal (*IterateAllActions)(rsRetVal (*pFunc)(void*, void*), void* pParam);
-	rsRetVal (*DestructAllActions)(void);
-	rsRetVal (*AddRule)(ruleset_t *pThis, rule_t **ppRule);
-	rsRetVal (*SetName)(ruleset_t *pThis, uchar *pszName);
+	rsRetVal (*IterateAllActions)(rsconf_t *conf, rsRetVal (*pFunc)(void*, void*), void* pParam);
+	rsRetVal (*DestructAllActions)(rsconf_t *conf);
+	rsRetVal (*AddRule)(rsconf_t *conf, ruleset_t *pThis, rule_t **ppRule);
+	rsRetVal (*SetName)(rsconf_t *conf, ruleset_t *pThis, uchar *pszName);
 	rsRetVal (*ProcessBatch)(batch_t*);
-	rsRetVal (*GetRuleset)(ruleset_t **ppThis, uchar*);
-	rsRetVal (*SetDefaultRuleset)(uchar*);
-	rsRetVal (*SetCurrRuleset)(uchar*);
+	rsRetVal (*GetRuleset)(rsconf_t *conf, ruleset_t **ppThis, uchar*);
+	rsRetVal (*SetDefaultRuleset)(rsconf_t *conf, uchar*);
+	rsRetVal (*SetCurrRuleset)(rsconf_t *conf, uchar*);
 	ruleset_t* (*GetCurrent)(void);
 	qqueue_t* (*GetRulesetQueue)(ruleset_t*);
 	/* v3, 2009-11-04 */
 	parserList_t* (*GetParserList)(msg_t *);
+	/* v5, 2011-04-19
+	 * added support for the rsconf object -- fundamental change
+	 */
 ENDinterface(ruleset)
-#define rulesetCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */
+#define rulesetCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */
 
 
 /* prototypes */
 PROTOTYPEObj(ruleset);
 
+/* TODO: remove these -- currently done dirty for config file
+ * redo -- rgerhards, 2011-04-19
+ */
+rsRetVal rulesetDestructForLinkedList(void *pData);
+rsRetVal rulesetKeyDestruct(void __attribute__((unused)) *pData);
 #endif /* #ifndef INCLUDED_RULESET_H */
diff --git a/runtime/typedefs.h b/runtime/typedefs.h
index d79612bc..11cc467d 100644
--- a/runtime/typedefs.h
+++ b/runtime/typedefs.h
@@ -81,6 +81,7 @@ typedef struct strgenList_s strgenList_t;
 typedef struct statsobj_s statsobj_t;
 typedef struct nsd_epworkset_s nsd_epworkset_t;
 typedef struct templates_s templates_t;
+typedef struct rulesets_s rulesets_t;
 typedef struct actions_s actions_t;
 typedef struct rsconf_s rsconf_t;
 typedef rsRetVal (*prsf_t)(struct vmstk_s*, int);	/* pointer to a RainerScript function */
diff --git a/tools/syslogd.c b/tools/syslogd.c
index c01fd6ad..dbc5ec64 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -815,7 +815,7 @@ DEFFUNC_llExecFunc(flushRptdMsgsActions)
 static void
 doFlushRptdMsgs(void)
 {
-	ruleset.IterateAllActions(flushRptdMsgsActions, NULL);
+	ruleset.IterateAllActions(ourConf, flushRptdMsgsActions, NULL);
 }
 
 
@@ -1026,7 +1026,7 @@ freeAllDynMemForTermination(void)
 static inline void
 destructAllActions(void)
 {
-	ruleset.DestructAllActions();
+	ruleset.DestructAllActions(ourConf);
 	bHaveMainQueue = 0; // flag that internal messages need to be temporarily stored
 }
 
@@ -1439,7 +1439,7 @@ finalize_it:
  */
 static void dbgPrintInitInfo(void)
 {
-	ruleset.DebugPrintAll();
+	ruleset.DebugPrintAll(ourConf);
 	DBGPRINTF("\n");
 	if(bDebugPrintTemplateList)
 		tplPrintList(ourConf);
@@ -1614,8 +1614,8 @@ init(void)
 
 	/* construct the default ruleset */
 	ruleset.Construct(&pRuleset);
-	ruleset.SetName(pRuleset, UCHAR_CONSTANT("RSYSLOG_DefaultRuleset"));
-	ruleset.ConstructFinalize(pRuleset);
+	ruleset.SetName(ourConf, pRuleset, UCHAR_CONSTANT("RSYSLOG_DefaultRuleset"));
+	ruleset.ConstructFinalize(ourConf, pRuleset);
 
 	/* open the configuration file */
 	localRet = conf.processConfFile(ourConf, ConfFile);
@@ -1654,7 +1654,7 @@ init(void)
 		} else {
 			DBGPRINTF("error %d obtaining controlling terminal, not using that emergency rule\n", errno);
 		}
-		ruleset.AddRule(ruleset.GetCurrent(), &pRule);
+		ruleset.AddRule(ourConf, ruleset.GetCurrent(), &pRule);
 	}
 
 	legacyOptsHook();
@@ -1758,7 +1758,7 @@ setDefaultRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 {
 	DEFiRet;
 
-	CHKiRet(ruleset.SetDefaultRuleset(pszName));
+	CHKiRet(ruleset.SetDefaultRuleset(ourConf, pszName));
 
 finalize_it:
 	free(pszName); /* no longer needed */
@@ -1797,13 +1797,13 @@ setCurrRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
 	rsRetVal localRet;
 	DEFiRet;
 
-	localRet = ruleset.SetCurrRuleset(pszName);
+	localRet = ruleset.SetCurrRuleset(ourConf, pszName);
 
 	if(localRet == RS_RET_NOT_FOUND) {
 		DBGPRINTF("begin new current rule set '%s'\n", pszName);
 		CHKiRet(ruleset.Construct(&pRuleset));
-		CHKiRet(ruleset.SetName(pRuleset, pszName));
-		CHKiRet(ruleset.ConstructFinalize(pRuleset));
+		CHKiRet(ruleset.SetName(ourConf, pRuleset, pszName));
+		CHKiRet(ruleset.ConstructFinalize(ourConf, pRuleset));
 	} else {
 		ABORT_FINALIZE(localRet);
 	}
@@ -1913,7 +1913,7 @@ doHUP(void)
 		logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)buf, 0);
 	}
 
-	ruleset.IterateAllActions(doHUPActions, NULL);
+	ruleset.IterateAllActions(ourConf, doHUPActions, NULL);
 }