3 files changed, 21 insertions, 18 deletions

diff --git a/plugins/imklog/bsd.c b/plugins/imklog/bsd.c
index d4f9f773..ad194b58 100644
--- a/plugins/imklog/bsd.c
+++ b/plugins/imklog/bsd.c
@@ -58,9 +58,6 @@ static int	fklog = -1;	/* kernel log fd */
 #ifdef OS_LINUX
 /* submit a message to imklog Syslog() API. In this function, we check if 
  * a kernel timestamp is present and, if so, extract and strip it.
- * Note: this is an extra processing step. We should revisit the whole
- * idea in v6 and remove all that old stuff that we do not longer need
- * (like symbol resolution). <-- TODO 
  * Note that this is heavily Linux specific and thus is not compiled or
  * used for BSD.
  * Special thanks to Lennart Poettering for suggesting on how to convert
@@ -73,7 +70,7 @@ static int	fklog = -1;	/* kernel log fd */
  * rgerhards, 2011-06-24
  */
 static void
-submitSyslog(int pri, uchar *buf)
+submitSyslog(modConfData_t *pModConf, int pri, uchar *buf)
 {
 	long secs;
 	long nsecs;
@@ -119,8 +116,10 @@ submitSyslog(int pri, uchar *buf)
 
 	/* we have a timestamp */
 	DBGPRINTF("kernel timestamp is %ld %ld\n", secs, nsecs);
-	bufsize= strlen((char*)buf);
-	memmove(buf+3, buf+i, bufsize - i + 1);
+	if(!pModConf->bKeepKernelStamp) {
+		bufsize= strlen((char*)buf);
+		memmove(buf+3, buf+i, bufsize - i + 1);
+	}
 
 	clock_gettime(CLOCK_MONOTONIC, &monotonic);
 	clock_gettime(CLOCK_REALTIME, &realtime);
@@ -146,7 +145,7 @@ done:
 }
 #else	/* now comes the BSD "code" (just a shim) */
 static void
-submitSyslog(int pri, uchar *buf)
+submitSyslog(modConfData_t *pModConf, int pri, uchar *buf)
 {
 	Syslog(pri, buf, NULL);
 }
@@ -196,7 +195,7 @@ finalize_it:
 /* Read kernel log while data are available, split into lines.
  */
 static void
-readklog(void)
+readklog(modConfData_t *pModConf)
 {
 	char *p, *q;
 	int len, i;
@@ -238,18 +237,18 @@ readklog(void)
 
 		for (p = (char*)pRcv; (q = strchr(p, '\n')) != NULL; p = q + 1) {
 			*q = '\0';
-			submitSyslog(LOG_INFO, (uchar*) p);
+			submitSyslog(pModConf, LOG_INFO, (uchar*) p);
 		}
 		len = strlen(p);
 		if (len >= iMaxLine - 1) {
-			submitSyslog(LOG_INFO, (uchar*)p);
+			submitSyslog(pModConf, LOG_INFO, (uchar*)p);
 			len = 0;
 		}
 		if(len > 0)
 			memmove(pRcv, p, len + 1);
 	}
 	if (len > 0)
-		submitSyslog(LOG_INFO, pRcv);
+		submitSyslog(pModConf, LOG_INFO, pRcv);
 
 	if(pRcv != NULL && (size_t) iMaxLine >= sizeof(bufRcv) - 1)
 		free(pRcv);
@@ -278,10 +277,10 @@ rsRetVal klogAfterRun(modConfData_t *pModConf)
  * "message pull" mechanism.
  * rgerhards, 2008-04-09
  */
-rsRetVal klogLogKMsg(modConfData_t __attribute__((unused)) *pModConf)
+rsRetVal klogLogKMsg(modConfData_t *pModConf)
 {
         DEFiRet;
-	readklog();
+	readklog(pModConf);
 	RETiRet;
 }
 
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 93323707..6eed33fe 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -91,6 +91,7 @@ static int bLegacyCnfModGlobalsPermitted;/* are legacy module-global config para
 static struct cnfparamdescr modpdescr[] = {
 	{ "logpath", eCmdHdlrGetWord, 0 },
 	{ "permitnonkernelfacility", eCmdHdlrBinary, 0 },
+	{ "keepkerneltimestamp", eCmdHdlrBinary, 0 },
 	{ "consoleloglevel", eCmdHdlrInt, 0 },
 	{ "internalmsgfacility", eCmdHdlrFacility, 0 }
 };
@@ -100,11 +101,8 @@ static struct cnfparamblk modpblk =
 	  modpdescr
 	};
 
-
-
 static prop_t *pInputName = NULL;	/* there is only one global inputName for all messages generated by this module */
-static prop_t *pLocalHostIP = NULL;	/* a pseudo-constant propterty for 127.0.0.1 */
-
+static prop_t *pLocalHostIP = NULL;
 
 static inline void
 initConfigSettings(void)
@@ -147,7 +145,8 @@ enqMsg(uchar *msg, uchar* pszTag, int iFacility, int iSeverity, struct timeval *
 	MsgSetTAG(pMsg, pszTag, ustrlen(pszTag));
 	pMsg->iFacility = iFacility;
 	pMsg->iSeverity = iSeverity;
-	CHKiRet(submitMsg(pMsg));
+	/* note: we do NOT use rate-limiting, as the kernel itself does rate-limiting */
+	CHKiRet(submitMsg2(pMsg));
 
 finalize_it:
 	RETiRet;
@@ -289,6 +288,7 @@ CODESTARTbeginCnfLoad
 	pModConf->pszPath = NULL;
 	pModConf->bPermitNonKernel = 0;
 	pModConf->console_log_level = -1;
+	pModConf->bKeepKernelStamp = 0;
 	pModConf->iFacilIntMsg = klogFacilIntMsg();
 	loadModConf->configSetViaV2Method = 0;
 	bLegacyCnfModGlobalsPermitted = 1;
@@ -322,6 +322,8 @@ CODESTARTsetModCnf
 			loadModConf->bPermitNonKernel = (int) pvals[i].val.d.n;
 		} else if(!strcmp(modpblk.descr[i].name, "consoleloglevel")) {
 			loadModConf->console_log_level= (int) pvals[i].val.d.n;
+		} else if(!strcmp(modpblk.descr[i].name, "keepkerneltimestamp")) {
+			loadModConf->bKeepKernelStamp = (int) pvals[i].val.d.n;
 		} else if(!strcmp(modpblk.descr[i].name, "internalmsgfacility")) {
 			loadModConf->iFacilIntMsg = (int) pvals[i].val.d.n;
 		} else {
@@ -347,6 +349,7 @@ CODESTARTendCnfLoad
 		loadModConf->bPermitNonKernel = cs.bPermitNonKernel;
 		loadModConf->iFacilIntMsg = cs.iFacilIntMsg;
 		loadModConf->console_log_level = cs.console_log_level;
+		loadModConf->bKeepKernelStamp = 0;
 		if((cs.pszPath == NULL) || (cs.pszPath[0] == '\0')) {
 			loadModConf->pszPath = NULL;
 			if(cs.pszPath != NULL)
diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h
index acfb50ab..6cd97c37 100644
--- a/plugins/imklog/imklog.h
+++ b/plugins/imklog/imklog.h
@@ -36,6 +36,7 @@ struct modConfData_s {
 	uchar *pszPath;
 	int console_log_level;
 	sbool bPermitNonKernel;
+	sbool bKeepKernelStamp;  /* keep kernel timestamp instead of interpreting it */
 	sbool configSetViaV2Method;
 };