implemented support for v2 config system in imrelp

1 files changed, 92 insertions, 37 deletions

diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c
index 725a40bb..1b03dcd3 100644
--- a/plugins/imrelp/imrelp.c
+++ b/plugins/imrelp/imrelp.c
@@ -39,6 +39,7 @@
 #include <librelp.h>
 #include "rsyslog.h"
 #include "dirty.h"
+#include "errmsg.h"
 #include "cfsysline.h"
 #include "module-template.h"
 #include "net.h"
@@ -53,29 +54,42 @@ MODULE_TYPE_NOKEEP
 DEF_IMOD_STATIC_DATA
 DEFobjCurrIf(net)
 DEFobjCurrIf(prop)
+DEFobjCurrIf(errmsg)
+
+/* forward definitions */
+static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal);
+
 
 /* Module static data */
 static relpEngine_t *pRelpEngine;	/* our relp engine */
 static prop_t *pInputName = NULL;	/* there is only one global inputName for all messages generated by this module */
 
+struct instanceConf_s {
+	uchar *pszBindPort;		/* port to bind to */
+	struct instanceConf_s *next;
+};
+
 
-/* config settings */
 struct modConfData_s {
-	EMPTY_STRUCT;
+	rsconf_t *pConf;		/* our overall config object */
+	instanceConf_t *root, *tail;
+	int iTCPSessMax; /* max number of sessions */
+	int iTCPLstnMax; /* max number of sessions */
+	int iStrmDrvrMode; /* mode for stream driver, driver-dependent (0 mostly means plain tcp) */
+	int bEmitMsgOnClose; /* emit an informational message on close by remote peer */
+	int iAddtlFrameDelim; /* addtl frame delimiter, e.g. for netscreen, default none */
+	int bDisableLFDelim; /* disable standard LF delimiter */
+	int bUseFlowControl; /* use flow control, what means indicate ourselfs a "light delayable" */
+	uchar *pszStrmDrvrAuthMode; /* authentication mode to use */
 };
 
+static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
+static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current load process */
 
-/* ------------------------------ callbacks ------------------------------ */
-#if 0
-/* this shall go into a specific ACL module! */
-static int
-isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((unused)) *pUsrSrv,
-	        void __attribute__((unused)) *pUsrSess)
-{
-	return net.isAllowedSender(net.pAllowedSenders_TCP, addr, fromHostFQDN);
-}
+//#include "im-helper.h" /* must be included AFTER the type definitions! */
 
-#endif // #if 0
+
+/* ------------------------------ callbacks ------------------------------ */
 
 /* callback for receiving syslog messages. This function is invoked from the
  * RELP engine when a syslog message arrived. It must return a relpRetVal,
@@ -101,7 +115,39 @@ onSyslogRcv(uchar *pHostname, uchar *pIP, uchar *pMsg, size_t lenMsg)
 /* ------------------------------ end callbacks ------------------------------ */
 
 
-static rsRetVal addListener(void __attribute__((unused)) *pVal, uchar *pNewVal)
+/* This function is called when a new listener instace shall be added to 
+ * the current config object via the legacy config system. It just shuffles
+ * all parameters to the listener in-memory instance.
+ * rgerhards, 2011-05-04
+ */
+static rsRetVal addInstance(void __attribute__((unused)) *pVal, uchar *pNewVal)
+{
+	instanceConf_t *inst;
+	DEFiRet;
+
+	CHKmalloc(inst = MALLOC(sizeof(instanceConf_t)));
+
+	if(pNewVal == NULL || *pNewVal == '\0') {
+		errmsg.LogError(0, NO_ERRCODE, "imrelp: port number must be specified, listener ignored");
+	}
+	inst->pszBindPort = pNewVal;
+	inst->next = NULL;
+
+	/* node created, let's add to config */
+	if(loadModConf->tail == NULL) {
+		loadModConf->tail = loadModConf->root = inst;
+	} else {
+		loadModConf->tail->next = inst;
+		loadModConf->tail = inst;
+	}
+
+finalize_it:
+	RETiRet;
+}
+
+
+static rsRetVal
+addListner(modConfData_t __attribute__((unused)) *modConf, instanceConf_t *inst)
 {
 	DEFiRet;
 	if(pRelpEngine == NULL) {
@@ -111,9 +157,7 @@ static rsRetVal addListener(void __attribute__((unused)) *pVal, uchar *pNewVal)
 		CHKiRet(relpEngineSetSyslogRcv(pRelpEngine, onSyslogRcv));
 	}
 
-	CHKiRet(relpEngineAddListner(pRelpEngine, pNewVal));
-
-	free(pNewVal); /* we do no longer need it */
+	CHKiRet(relpEngineAddListner(pRelpEngine, inst->pszBindPort));
 
 finalize_it:
 	RETiRet;
@@ -122,19 +166,37 @@ finalize_it:
 
 BEGINbeginCnfLoad
 CODESTARTbeginCnfLoad
+	loadModConf = pModConf;
+	pModConf->pConf = pConf;
+	/* init legacy config variables */
+	resetConfigVariables(NULL, NULL); /* dummy parameters just to fulfill interface def */
 ENDbeginCnfLoad
 
 
 BEGINendCnfLoad
 CODESTARTendCnfLoad
+	loadModConf = NULL; /* done loading */
 ENDendCnfLoad
 
 
 BEGINcheckCnf
 CODESTARTcheckCnf
+	/* so far, we have nothing to check... */
 ENDcheckCnf
 
 
+BEGINactivateCnfPrePrivDrop
+	instanceConf_t *inst;
+CODESTARTactivateCnfPrePrivDrop
+	runModConf = pModConf;
+	for(inst = runModConf->root ; inst != NULL ; inst = inst->next) {
+		addListner(pModConf, inst);
+	}
+	if(pRelpEngine == NULL)
+		ABORT_FINALIZE(RS_RET_NO_RUN);
+finalize_it:
+ENDactivateCnfPrePrivDrop
+
 BEGINactivateCnf
 CODESTARTactivateCnf
 ENDactivateCnf
@@ -155,34 +217,14 @@ CODESTARTrunInput
 ENDrunInput
 
 
-/* initialize and return if will run or not */
 BEGINwillRun
 CODESTARTwillRun
-	/* first apply some config settings */
-	//net.PrintAllowedSenders(2); /* TCP */
-	if(pRelpEngine == NULL)
-		ABORT_FINALIZE(RS_RET_NO_RUN);
-
-	/* we need to create the inputName property (only once during our lifetime) */
-	CHKiRet(prop.Construct(&pInputName));
-	CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("imrelp"), sizeof("imrelp") - 1));
-	CHKiRet(prop.ConstructFinalize(pInputName));
-finalize_it:
 ENDwillRun
 
 
 BEGINafterRun
 CODESTARTafterRun
 	/* do cleanup here */
-#if 0
-	if(net.pAllowedSenders_TCP != NULL) {
-		net.clearAllowedSenders(net.pAllowedSenders_TCP);
-		net.pAllowedSenders_TCP = NULL;
-	}
-#endif
-
-	if(pInputName != NULL)
-		prop.Destruct(&pInputName);
 ENDafterRun
 
 
@@ -191,9 +233,14 @@ CODESTARTmodExit
 	if(pRelpEngine != NULL)
 		iRet = relpEngineDestruct(&pRelpEngine);
 
+	/* global variable cleanup */
+	if(pInputName != NULL)
+		prop.Destruct(&pInputName);
+
 	/* release objects we used */
 	objRelease(prop, CORE_COMPONENT);
 	objRelease(net, LM_NET_FILENAME);
+	objRelease(errmsg, CORE_COMPONENT);
 ENDmodExit
 
 
@@ -208,6 +255,8 @@ resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unus
 BEGINqueryEtryPt
 CODESTARTqueryEtryPt
 CODEqueryEtryPt_STD_IMOD_QUERIES
+CODEqueryEtryPt_STD_CONF2_QUERIES
+CODEqueryEtryPt_STD_CONF2_PREPRIVDROP_QUERIES
 ENDqueryEtryPt
 
 
@@ -218,13 +267,19 @@ CODEmodInit_QueryRegCFSLineHdlr
 	pRelpEngine = NULL;
 	/* request objects we use */
 	CHKiRet(objUse(prop, CORE_COMPONENT));
+	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 	CHKiRet(objUse(net, LM_NET_FILENAME));
 
 	/* register config file handlers */
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputrelpserverrun", 0, eCmdHdlrGetWord,
-				   addListener, NULL, STD_LOADABLE_MODULE_ID, eConfObjGlobal));
+				   addInstance, NULL, STD_LOADABLE_MODULE_ID, eConfObjGlobal));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
 		resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjGlobal));
+
+	/* we need to create the inputName property (only once during our lifetime) */
+	CHKiRet(prop.Construct(&pInputName));
+	CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("imrelp"), sizeof("imrelp") - 1));
+	CHKiRet(prop.ConstructFinalize(pInputName));
 ENDmodInit