1 files changed, 69 insertions, 118 deletions

diff --git a/runtime/rsconf.c b/runtime/rsconf.c
index 946d1014..96118538 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"
@@ -64,11 +63,12 @@
 #include "threads.h"
 #include "datetime.h"
 #include "parserif.h"
+#include "modules.h"
 #include "dirty.h"
+#include "template.h"
 
 /* static data */
 DEFobjStaticHelpers
-DEFobjCurrIf(rule)
 DEFobjCurrIf(ruleset)
 DEFobjCurrIf(module)
 DEFobjCurrIf(conf)
@@ -152,10 +152,33 @@ rsRetVal rsconfConstructFinalize(rsconf_t __attribute__((unused)) *pThis)
 }
 
 
+/* call freeCnf() module entry points AND free the module entries themselfes.
+ */
+static inline void
+freeCnf(rsconf_t *pThis)
+{
+	cfgmodules_etry_t *etry, *del;
+	etry = pThis->modules.root;
+	while(etry != NULL) {
+		if(etry->pMod->beginCnfLoad != NULL) {
+			dbgprintf("calling freeCnf(%p) for module '%s'\n",
+				  etry->modCnf, (char*) module.GetName(etry->pMod));
+			etry->pMod->freeCnf(etry->modCnf);
+		}
+		del = etry;
+		etry = etry->next;
+		free(del);
+	}
+}
+
+
 /* destructor for the rsconf object */
 BEGINobjDestruct(rsconf) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(rsconf)
+	freeCnf(pThis);
+	tplDeleteAll(pThis);
 	free(pThis->globals.mainQ.pszMainMsgQFName);
+	free(pThis->globals.pszConfDAGFile);
 	llDestroy(&(pThis->rulesets.llRulesets));
 ENDobjDestruct(rsconf)
 
@@ -218,54 +241,6 @@ CODESTARTobjDebugPrint(rsconf)
 ENDobjDebugPrint(rsconf)
 
 
-rsRetVal
-cnfDoActlst(struct cnfactlst *actlst, rule_t *pRule)
-{
-	struct cnfcfsyslinelst *cflst;
-	action_t *pAction;
-	uchar *str;
-	rsRetVal localRet;
-	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;
-			if((localRet = cflineDoAction(loadConf, &str, &pAction)) != RS_RET_OK) {
-				uchar szErrLoc[MAXFNAME + 64];
-				if(localRet != RS_RET_OK_WARN) {
-					DBGPRINTF("legacy action line NOT successfully processed\n");
-				}
-				snprintf((char*)szErrLoc, sizeof(szErrLoc) / sizeof(uchar),
-					 "%s, line %d", actlst->cnfFile, actlst->lineno);
-				errmsg.LogError(0, NO_ERRCODE, "the last %s occured in %s:\"%s\"",
-					(localRet == RS_RET_OK_WARN) ? "warning" : "error",
-					(char*)szErrLoc, (char*)actlst->data.legActLine);
-				if(localRet != RS_RET_OK_WARN) {
-					ABORT_FINALIZE(localRet);
-				}
-			}
-			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
@@ -360,9 +335,6 @@ parser_errmsg(char *fmt, ...)
 	va_start(ap, fmt);
 	if(vsnprintf(errBuf, sizeof(errBuf), fmt, ap) == sizeof(errBuf))
 		errBuf[sizeof(errBuf)-1] = '\0';
-dbgprintf("XXXX: msg: %s\n", errBuf);
-dbgprintf("XXXX: cnfcurrfn: %s\n", cnfcurrfn);
-dbgprintf("XXXX: yylineno: %d\n", yylineno);
 	errmsg.LogError(0, RS_RET_CONF_PARSE_ERROR,
 			"error during parsing file %s, on or before line %d: %s",
 			cnfcurrfn, yylineno, errBuf);
@@ -377,69 +349,40 @@ yyerror(char *s)
 }
 void cnfDoObj(struct cnfobj *o)
 {
+	int bChkUnuse = 1;
+
 	dbgprintf("cnf:global:obj: ");
 	cnfobjPrint(o);
 	switch(o->objType) {
 	case CNFOBJ_GLOBAL:
 		glblProcessCnf(o);
 		break;
+	case CNFOBJ_MODULE:
+		modulesProcessCnf(o);
+		break;
 	case CNFOBJ_ACTION:
 		actionProcessCnf(o);
 		break;
+	case CNFOBJ_TPL:
+		tplProcessCnf(o);
+		break;
+	case CNFOBJ_PROPERTY:
+	case CNFOBJ_CONSTANT:
+		/* these types are processed at a later stage */
+		bChkUnuse = 0;
+		break;
 	}
-	nvlstChkUnused(o->nvlst);
+	if(bChkUnuse)
+		nvlstChkUnused(o->nvlst);
 	cnfobjDestruct(o);
 }
 
-void cnfDoRule(struct cnfrule *cnfrule)
+void cnfDoScript(struct cnfstmt *script)
 {
-	rule_t *pRule;
-	uchar *str;
-	rsRetVal iRet = RS_RET_OK; //DEFiRet;
-
-	dbgprintf("cnf:global:rule\n");
-	cnfrulePrint(cnfrule);
-
-	CHKiRet(rule.Construct(&pRule)); /* create "fresh" selector */
-	CHKiRet(rule.SetAssRuleset(pRule, ruleset.GetCurrent(loadConf)));
-	CHKiRet(rule.ConstructFinalize(pRule));
-
-	switch(cnfrule->filttype) {
-	case CNFFILT_NONE:
-		break;
-	case CNFFILT_PRI:
-		str = (uchar*) cnfrule->filt.s;
-		iRet = cflineProcessTradPRIFilter(&str, pRule);
-		break;
-	case CNFFILT_PROP:
-		dbgprintf("%s\n", cnfrule->filt.s);
-		str = (uchar*) cnfrule->filt.s;
-		iRet = cflineProcessPropFilter(&str, pRule);
-		break;
-	case CNFFILT_SCRIPT:
-		pRule->f_filter_type = FILTER_EXPR;
-		pRule->f_filterData.expr = cnfrule->filt.expr;
-		break;
-	}
-	/* we now check if there are some global (BSD-style) filter conditions
-	 * and, if so, we copy them over. rgerhards, 2005-10-18
-	 */
-	if(pDfltProgNameCmp != NULL) {
-		CHKiRet(rsCStrConstructFromCStr(&(pRule->pCSProgNameComp), pDfltProgNameCmp));
-	}
-
-	if(eDfltHostnameCmpMode != HN_NO_COMP) {
-		pRule->eHostnameCmpMode = eDfltHostnameCmpMode;
-		CHKiRet(rsCStrConstructFromCStr(&(pRule->pCSHostnameComp), pDfltHostnameCmp));
-	}
-
-	cnfDoActlst(cnfrule->actlst, pRule);
-
-	CHKiRet(ruleset.AddRule(rule.GetAssRuleset(pRule), &pRule));
-
-finalize_it:
-	//TODO: do something with error states
-	cnfruleDestruct(cnfrule);
+	// TODO: streamline this, call directly into ruleset from grammar.y
+	// TODO: BSD-Style blocks?
+	dbgprintf("cnf:global:script\n");
+	ruleset.AddScript(ruleset.GetCurrent(loadConf), script);
 }
 
 void cnfDoCfsysline(char *ln)
@@ -453,13 +396,21 @@ void cnfDoCfsysline(char *ln)
 void cnfDoBSDTag(char *ln)
 {
 	DBGPRINTF("cnf:global:BSD tag: %s\n", ln);
-	cflineProcessTagSelector((uchar**)&ln);
+	errmsg.LogError(0, RS_RET_BSD_BLOCKS_UNSUPPORTED,
+			"BSD-style blocks are no longer supported in rsyslog, "
+			"see http://www.rsyslog.com/g/BSD for details and a "
+			"solution (Block '%s')", ln);
+	free(ln);
 }
 
 void cnfDoBSDHost(char *ln)
 {
 	DBGPRINTF("cnf:global:BSD host: %s\n", ln);
-	cflineProcessHostSelector((uchar**)&ln);
+	errmsg.LogError(0, RS_RET_BSD_BLOCKS_UNSUPPORTED,
+			"BSD-style blocks are no longer supported in rsyslog, "
+			"see http://www.rsyslog.com/g/BSD for details and a "
+			"solution (Block '%s')", ln);
+	free(ln);
 }
 
 es_str_t*
@@ -701,9 +652,10 @@ runInputModules(void)
 	node = module.GetNxtCnfType(runConf, NULL, eMOD_IN);
 	while(node != NULL) {
 		if(node->canRun) {
-			DBGPRINTF("running module %s with config %p\n", node->pMod->pszName, node);
 			bNeedsCancel = (node->pMod->isCompatibleWithFeature(sFEATURENonCancelInputTermination) == RS_RET_OK) ?
 				       0 : 1;
+			DBGPRINTF("running module %s with config %p, term mode: %s\n", node->pMod->pszName, node,
+				  bNeedsCancel ? "cancel" : "cooperative/SIGTTIN");
 			thrdCreate(node->pMod->mod.im.runInput, node->pMod->mod.im.afterRun, bNeedsCancel,
 			           (node->pMod->cnfName == NULL) ? node->pMod->pszName : node->pMod->cnfName);
 		}
@@ -1007,12 +959,12 @@ loadBuildInModules()
 {
 	DEFiRet;
 
-	CHKiRet(regBuildInModule(modInitFile, UCHAR_CONSTANT("builtin-file"), NULL));
-	CHKiRet(regBuildInModule(modInitPipe, UCHAR_CONSTANT("builtin-pipe"), NULL));
+	CHKiRet(regBuildInModule(modInitFile, UCHAR_CONSTANT("builtin:omfile"), NULL));
+	CHKiRet(regBuildInModule(modInitPipe, UCHAR_CONSTANT("builtin:ompipe"), NULL));
 	CHKiRet(regBuildInModule(modInitShell, UCHAR_CONSTANT("builtin-shell"), NULL));
-	CHKiRet(regBuildInModule(modInitDiscard, UCHAR_CONSTANT("builtin-discard"), NULL));
+	CHKiRet(regBuildInModule(modInitDiscard, UCHAR_CONSTANT("builtin:omdiscard"), NULL));
 #	ifdef SYSLOG_INET
-	CHKiRet(regBuildInModule(modInitFwd, UCHAR_CONSTANT("builtin-fwd"), NULL));
+	CHKiRet(regBuildInModule(modInitFwd, UCHAR_CONSTANT("builtin:omfwd"), NULL));
 #	endif
 
 	/* dirty, but this must be for the time being: the usrmsg module must always be
@@ -1024,11 +976,11 @@ loadBuildInModules()
 	 * User names now must begin with:
 	 *   [a-zA-Z0-9_.]
 	 */
-	CHKiRet(regBuildInModule(modInitUsrMsg, (uchar*) "builtin-usrmsg", NULL));
+	CHKiRet(regBuildInModule(modInitUsrMsg, (uchar*) "builtin:omusrmsg", NULL));
 
 	/* load build-in parser modules */
-	CHKiRet(regBuildInModule(modInitpmrfc5424, UCHAR_CONSTANT("builtin-pmrfc5424"), NULL));
-	CHKiRet(regBuildInModule(modInitpmrfc3164, UCHAR_CONSTANT("builtin-pmrfc3164"), NULL));
+	CHKiRet(regBuildInModule(modInitpmrfc5424, UCHAR_CONSTANT("builtin:pmrfc5424"), NULL));
+	CHKiRet(regBuildInModule(modInitpmrfc3164, UCHAR_CONSTANT("builtin:pmrfc3164"), NULL));
 
 	/* and set default parser modules. Order is *very* important, legacy
 	 * (3164) parser needs to go last! */
@@ -1036,10 +988,10 @@ loadBuildInModules()
 	CHKiRet(parser.AddDfltParser(UCHAR_CONSTANT("rsyslog.rfc3164")));
 
 	/* load build-in strgen modules */
-	CHKiRet(regBuildInModule(modInitsmfile, UCHAR_CONSTANT("builtin-smfile"), NULL));
-	CHKiRet(regBuildInModule(modInitsmtradfile, UCHAR_CONSTANT("builtin-smtradfile"), NULL));
-	CHKiRet(regBuildInModule(modInitsmfwd, UCHAR_CONSTANT("builtin-smfwd"), NULL));
-	CHKiRet(regBuildInModule(modInitsmtradfwd, UCHAR_CONSTANT("builtin-smtradfwd"), NULL));
+	CHKiRet(regBuildInModule(modInitsmfile, UCHAR_CONSTANT("builtin:smfile"), NULL));
+	CHKiRet(regBuildInModule(modInitsmtradfile, UCHAR_CONSTANT("builtin:smtradfile"), NULL));
+	CHKiRet(regBuildInModule(modInitsmfwd, UCHAR_CONSTANT("builtin:smfwd"), NULL));
+	CHKiRet(regBuildInModule(modInitsmtradfwd, UCHAR_CONSTANT("builtin:smtradfwd"), NULL));
 
 finalize_it:
 	if(iRet != RS_RET_OK) {
@@ -1282,6 +1234,7 @@ ourConf = loadConf; // TODO: remove, once ourConf is gone!
 		ABORT_FINALIZE(RS_RET_NO_ACTIONS);
 	}
 	tellLexEndParsing();
+	rulesetOptimizeAll(loadConf);
 
 	tellCoreConfigLoadDone();
 	tellModulesConfigLoadDone();
@@ -1340,7 +1293,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));
@@ -1357,7 +1309,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);