1 files changed, 60 insertions, 66 deletions

diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 92fd30c3..8a10e26f 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -5,7 +5,7 @@
  *
  * Work originally begun on 2008-02-01 by Rainer Gerhards
  *
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008,2009 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of rsyslog.
  *
@@ -46,6 +46,7 @@
 #include "glbl.h"
 #include "datetime.h"
 #include "unicode-helper.h"
+#include "prop.h"
 
 MODULE_TYPE_INPUT	/* must be present for input modules, do not remove */
 
@@ -56,10 +57,13 @@ DEF_IMOD_STATIC_DATA	/* must be present, starts static data */
 DEFobjCurrIf(errmsg)
 DEFobjCurrIf(glbl)
 DEFobjCurrIf(datetime)
+DEFobjCurrIf(strm)
+DEFobjCurrIf(prop)
 
 typedef struct fileInfo_s {
 	uchar *pszFileName;
 	uchar *pszTag;
+	size_t lenTag;
 	uchar *pszStateFile; /* file in which state between runs is to be stored */
 	int iFacility;
 	int iSeverity;
@@ -79,6 +83,7 @@ static int iFilPtr = 0;		/* number of files to be monitored; pointer to next fre
 #define MAX_INPUT_FILES 100
 static fileInfo_t files[MAX_INPUT_FILES];
 
+static prop_t *pInputName = NULL;	/* there is only one global inputName for all messages generated by this input */
 
 /* enqueue the read file line as a message. The provided string is
  * not freed - thuis must be done by the caller.
@@ -95,15 +100,13 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine)
 
 	CHKiRet(msgConstruct(&pMsg));
 	MsgSetFlowControlType(pMsg, eFLOWCTL_FULL_DELAY);
-	MsgSetInputName(pMsg, UCHAR_CONSTANT("imfile"));
-	MsgSetUxTradMsg(pMsg, (char*)rsCStrGetSzStr(cstrLine));
-	MsgSetRawMsg(pMsg, (char*)rsCStrGetSzStr(cstrLine));
-	MsgSetMSG(pMsg, (char*)rsCStrGetSzStr(cstrLine));
-	MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName());
-	MsgSetTAG(pMsg, (char*)pInfo->pszTag);
+	MsgSetInputName(pMsg, pInputName);
+	MsgSetRawMsg(pMsg, (char*)rsCStrGetSzStr(cstrLine), cstrLen(cstrLine));
+	MsgSetMSGoffs(pMsg, 0);	/* we do not have a header... */
+	MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName(), ustrlen(glbl.GetLocalHostName()));
+	MsgSetTAG(pMsg, pInfo->pszTag, pInfo->lenTag);
 	pMsg->iFacility = LOG_FAC(pInfo->iFacility);
 	pMsg->iSeverity = LOG_PRI(pInfo->iSeverity);
-	pMsg->bParseHOSTNAME = 0;
 	CHKiRet(submitMsg(pMsg));
 finalize_it:
 	RETiRet;
@@ -139,16 +142,16 @@ openFile(fileInfo_t *pThis)
 
 	/* If we reach this point, we have a .si file */
 
-	CHKiRet(strmConstruct(&psSF));
-	CHKiRet(strmSettOperationsMode(psSF, STREAMMODE_READ));
-	CHKiRet(strmSetsType(psSF, STREAMTYPE_FILE_SINGLE));
-	CHKiRet(strmSetFName(psSF, pszSFNam, lenSFNam));
-	CHKiRet(strmConstructFinalize(psSF));
+	CHKiRet(strm.Construct(&psSF));
+	CHKiRet(strm.SettOperationsMode(psSF, STREAMMODE_READ));
+	CHKiRet(strm.SetsType(psSF, STREAMTYPE_FILE_SINGLE));
+	CHKiRet(strm.SetFName(psSF, pszSFNam, lenSFNam));
+	CHKiRet(strm.ConstructFinalize(psSF));
 
 	/* read back in the object */
 	CHKiRet(obj.Deserialize(&pThis->pStrm, (uchar*) "strm", psSF, NULL, pThis));
 
-	CHKiRet(strmSeekCurrOffs(pThis->pStrm));
+	CHKiRet(strm.SeekCurrOffs(pThis->pStrm));
 
 	/* OK, we could successfully read the file, so we now can request that it be deleted.
 	 * If we need it again, it will be written on the next shutdown.
@@ -157,14 +160,14 @@ openFile(fileInfo_t *pThis)
 
 finalize_it:
 	if(psSF != NULL)
-		strmDestruct(&psSF);
+		strm.Destruct(&psSF);
 
 	if(iRet != RS_RET_OK) {
-		CHKiRet(strmConstruct(&pThis->pStrm));
-		CHKiRet(strmSettOperationsMode(pThis->pStrm, STREAMMODE_READ));
-		CHKiRet(strmSetsType(pThis->pStrm, STREAMTYPE_FILE_MONITOR));
-		CHKiRet(strmSetFName(pThis->pStrm, pThis->pszFileName, strlen((char*) pThis->pszFileName)));
-		CHKiRet(strmConstructFinalize(pThis->pStrm));
+		CHKiRet(strm.Construct(&pThis->pStrm));
+		CHKiRet(strm.SettOperationsMode(pThis->pStrm, STREAMMODE_READ));
+		CHKiRet(strm.SetsType(pThis->pStrm, STREAMTYPE_FILE_MONITOR));
+		CHKiRet(strm.SetFName(pThis->pStrm, pThis->pszFileName, strlen((char*) pThis->pszFileName)));
+		CHKiRet(strm.ConstructFinalize(pThis->pStrm));
 	}
 
 	RETiRet;
@@ -203,14 +206,14 @@ static rsRetVal pollFile(fileInfo_t *pThis, int *pbHadFileData)
 
 	/* loop below will be exited when strmReadLine() returns EOF */
 	while(1) {
-		CHKiRet(strmReadLine(pThis->pStrm, &pCStr));
+		CHKiRet(strm.ReadLine(pThis->pStrm, &pCStr));
 		*pbHadFileData = 1; /* this is just a flag, so set it and forget it */
 		CHKiRet(enqLine(pThis, pCStr)); /* process line */
 		rsCStrDestruct(&pCStr); /* discard string (must be done by us!) */
 	}
 
 finalize_it:
-	/*EMPTY - just to keep the compiler happy, do NOT remove*/;
+		; /*EMPTY STATEMENT - needed to keep compiler happy - see below! */
 	/* Note: the problem above is that pthread:cleanup_pop() is a macro which
 	 * evaluates to something like "} while(0);". So the code would become
 	 * "finalize_it: }", that is a label without a statement. The C standard does
@@ -240,27 +243,12 @@ finalize_it:
  * IMPORTANT: the calling interface of this function can NOT be modified. It actually is
  * called by pthreads. The provided argument is currently not being used.
  */
-/* ------------------------------------------------------------------------------------------ *
- * DO NOT TOUCH the following code - it will soon be part of the module generation macros!    */
 static void
 inputModuleCleanup(void __attribute__((unused)) *arg)
 {
 	BEGINfunc
-/* END no-touch zone                                                                          *
- * ------------------------------------------------------------------------------------------ */
-
-
-
-	/* so far not needed */
-
-
-
-/* ------------------------------------------------------------------------------------------ *
- * DO NOT TOUCH the following code - it will soon be part of the module generation macros!    */
 	ENDfunc
 }
-/* END no-touch zone                                                                          *
- * ------------------------------------------------------------------------------------------ */
 
 
 /* This function is called by the framework to gather the input. The module stays
@@ -288,28 +276,22 @@ BEGINrunInput
 	int i;
 	int bHadFileData; /* were there at least one file with data during this run? */
 CODESTARTrunInput
-	/* ------------------------------------------------------------------------------------------ *
-	 * DO NOT TOUCH the following code - it will soon be part of the module generation macros!    */
 	pthread_cleanup_push(inputModuleCleanup, NULL);
-	while(1) { /* endless loop - do NOT break; out of it! */
-	/* END no-touch zone                                                                          *
-	 * ------------------------------------------------------------------------------------------ */
+	while(1) {
 
-	do {
-		bHadFileData = 0;
-		for(i = 0 ; i < iFilPtr ; ++i) {
-			pollFile(&files[i], &bHadFileData);
-		}
-	} while(iFilPtr > 1 && bHadFileData == 1); /* waring: do...while()! */
+		do {
+			bHadFileData = 0;
+			for(i = 0 ; i < iFilPtr ; ++i) {
+				pollFile(&files[i], &bHadFileData);
+			}
+		} while(iFilPtr > 1 && bHadFileData == 1); /* warning: do...while()! */
 
-	/* Note: the additional 10ns wait is vitally important. It guards rsyslog against totally
-	 * hogging the CPU if the users selects a polling interval of 0 seconds. It doesn't hurt any
-	 * other valid scenario. So do not remove. -- rgerhards, 2008-02-14
-	 */
-	srSleep(iPollInterval, 10);
+		/* Note: the additional 10ns wait is vitally important. It guards rsyslog against totally
+		 * hogging the CPU if the users selects a polling interval of 0 seconds. It doesn't hurt any
+		 * other valid scenario. So do not remove. -- rgerhards, 2008-02-14
+		 */
+		srSleep(iPollInterval, 10);
 
-	/* ------------------------------------------------------------------------------------------ *
-	 * DO NOT TOUCH the following code - it will soon be part of the module generation macros!    */
 	}
 	/*NOTREACHED*/
 	
@@ -335,6 +317,11 @@ CODESTARTwillRun
 		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("imfile"), sizeof("imfile") - 1));
+	CHKiRet(prop.ConstructFinalize(pInputName));
+
 finalize_it:
 ENDwillRun
 
@@ -354,21 +341,20 @@ persistStrmState(fileInfo_t *pInfo)
 	ASSERT(pInfo != NULL);
 
 	/* TODO: create a function persistObj in obj.c? */
-	CHKiRet(strmConstruct(&psSF));
-	CHKiRet(strmSetDir(psSF, glbl.GetWorkDir(), strlen((char*)glbl.GetWorkDir())));
-	CHKiRet(strmSettOperationsMode(psSF, STREAMMODE_WRITE));
-	CHKiRet(strmSetiAddtlOpenFlags(psSF, O_TRUNC));
-	CHKiRet(strmSetsType(psSF, STREAMTYPE_FILE_SINGLE));
-	CHKiRet(strmSetFName(psSF, pInfo->pszStateFile, strlen((char*) pInfo->pszStateFile)));
-	CHKiRet(strmConstructFinalize(psSF));
+	CHKiRet(strm.Construct(&psSF));
+	CHKiRet(strm.SetDir(psSF, glbl.GetWorkDir(), strlen((char*)glbl.GetWorkDir())));
+	CHKiRet(strm.SettOperationsMode(psSF, STREAMMODE_WRITE_TRUNC));
+	CHKiRet(strm.SetsType(psSF, STREAMTYPE_FILE_SINGLE));
+	CHKiRet(strm.SetFName(psSF, pInfo->pszStateFile, strlen((char*) pInfo->pszStateFile)));
+	CHKiRet(strm.ConstructFinalize(psSF));
 
-	CHKiRet(strmSerialize(pInfo->pStrm, psSF));
+	CHKiRet(strm.Serialize(pInfo->pStrm, psSF));
 
-	CHKiRet(strmDestruct(&psSF));
+	CHKiRet(strm.Destruct(&psSF));
 
 finalize_it:
 	if(psSF != NULL)
-		strmDestruct(&psSF);
+		strm.Destruct(&psSF);
 
 	RETiRet;
 }
@@ -388,9 +374,12 @@ CODESTARTafterRun
 	for(i = 0 ; i < iFilPtr ; ++i) {
 		if(files[i].pStrm != NULL) { /* stream open? */
 			persistStrmState(&files[i]);
-			strmDestruct(&(files[i].pStrm));
+			strm.Destruct(&(files[i].pStrm));
 		}
 	}
+
+	if(pInputName != NULL)
+		prop.Destruct(&pInputName);
 ENDafterRun
 
 
@@ -401,9 +390,11 @@ ENDafterRun
 BEGINmodExit
 CODESTARTmodExit
 	/* release objects we used */
+	objRelease(strm, CORE_COMPONENT);
 	objRelease(datetime, CORE_COMPONENT);
 	objRelease(glbl, CORE_COMPONENT);
 	objRelease(errmsg, CORE_COMPONENT);
+	objRelease(prop, CORE_COMPONENT);
 ENDmodExit
 
 
@@ -471,6 +462,7 @@ static rsRetVal addMonitor(void __attribute__((unused)) *pVal, uchar *pNewVal)
 			ABORT_FINALIZE(RS_RET_CONFIG_ERROR);
 		} else {
 			pThis->pszTag = (uchar*) strdup((char*) pszFileTag);
+			pThis->lenTag = ustrlen(pThis->pszTag);
 		}
 
 		if(pszStateFile == NULL) {
@@ -512,6 +504,8 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 	CHKiRet(objUse(glbl, CORE_COMPONENT));
 	CHKiRet(objUse(datetime, CORE_COMPONENT));
+	CHKiRet(objUse(strm, CORE_COMPONENT));
+	CHKiRet(objUse(prop, CORE_COMPONENT));
 
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputfilename", 0, eCmdHdlrGetWord,
 	  	NULL, &pszFileName, STD_LOADABLE_MODULE_ID));