step: imtcp moved to new config interface

as far as we know that new interface right now ;)

4 files changed, 71 insertions, 1 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index cfcfdc2c..a107e21a 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -13,6 +13,7 @@ librsyslog_la_SOURCES = \
 	batch.h \
 	syslogd-types.h \
 	module-template.h \
+	im-helper.h \
 	obj-types.h \
 	nsd.h \
 	glbl.h \
diff --git a/runtime/im-helper.h b/runtime/im-helper.h
new file mode 100644
index 00000000..6bbd6d70
--- /dev/null
+++ b/runtime/im-helper.h
@@ -0,0 +1,66 @@
+/* im-helper.h
+ * This file contains helper constructs that save time writing input modules. It
+ * assumes some common field names and plumbing. It is intended to be used together
+ * with module-template.h
+ *
+ * File begun on 2011-05-04 by RGerhards
+ *
+ * Copyright 2011 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of the rsyslog runtime library.
+ *
+ * The rsyslog runtime library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The rsyslog runtime library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the rsyslog runtime library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
+ */
+#ifndef	IM_HELPER_H_INCLUDED
+#define	IM_HELPER_H_INCLUDED 1
+
+
+/* The following function provides a complete implementation to check a
+ * ruleset and set the actual ruleset pointer. The macro assumes that
+ * standard field names are used. A functon std_checkRuleset_genErrMsg()
+ * must be defined to generate error messages in case the ruleset cannot
+ * be found.
+ */
+static inline void std_checkRuleset_genErrMsg(modConfData_t *modConf, instanceConf_t *inst);
+static inline rsRetVal
+std_checkRuleset(modConfData_t *modConf, instanceConf_t *inst)
+{
+	ruleset_t *pRuleset;
+	rsRetVal localRet;
+	DEFiRet;
+
+	inst->pBindRuleset = NULL;	/* assume default ruleset */
+
+	if(inst->pszBindRuleset == NULL)
+		FINALIZE;
+dbgprintf("ZZZZZ: inst->pszBindRuleset %s\n", inst->pszBindRuleset);
+
+	localRet = ruleset.GetRuleset(modConf->pConf, &pRuleset, inst->pszBindRuleset);
+	if(localRet == RS_RET_NOT_FOUND) {
+		std_checkRuleset_genErrMsg(modConf, inst);
+	}
+	CHKiRet(localRet);
+	inst->pBindRuleset = pRuleset;
+
+finalize_it:
+	RETiRet;
+}
+
+#endif /* #ifndef IM_HELPER_H_INCLUDED */
+
+/* vim:set ai:
+ */
diff --git a/runtime/module-template.h b/runtime/module-template.h
index 38cda4ba..965d48d0 100644
--- a/runtime/module-template.h
+++ b/runtime/module-template.h
@@ -584,7 +584,6 @@ finalize_it:\
 #define CODEmodInit_QueryRegCFSLineHdlr \
 	CHKiRet(pHostQueryEtryPt((uchar*)"regCfSysLineHdlr", &omsdRegCFSLineHdlr));
 
-#endif /* #ifndef MODULE_TEMPLATE_H_INCLUDED */
 
 /* modExit()
  * This is the counterpart to modInit(). It destroys a module and makes it ready for
@@ -853,5 +852,7 @@ static rsRetVal GetStrgenName(uchar **ppSz)\
 }
 
 
+#endif /* #ifndef MODULE_TEMPLATE_H_INCLUDED */
+
 /* vim:set ai:
  */
diff --git a/runtime/typedefs.h b/runtime/typedefs.h
index 1c8e93ce..11061e14 100644
--- a/runtime/typedefs.h
+++ b/runtime/typedefs.h
@@ -90,6 +90,8 @@ typedef struct rsconf_s rsconf_t;
 typedef struct cfgmodules_s cfgmodules_t;
 typedef struct cfgmodules_etry_s cfgmodules_etry_t;
 typedef struct outchannels_s outchannels_t;
+typedef struct modConfData_s modConfData_t;
+typedef struct instanceConf_s instanceConf_t;
 typedef rsRetVal (*prsf_t)(struct vmstk_s*, int);	/* pointer to a RainerScript function */
 typedef uint64 qDeqID;	/* queue Dequeue order ID. 32 bits is considered dangerously few */