From 8528344ef58b5d2907bba8809f63d0bca2ce8d38 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 7 Oct 2008 14:26:41 +0200
Subject: "output" timestamp now taken from mesg's time generated

This enhances performance and, as some have pointed out, is
probably also more consistent with what users expect how
the various output-timestamp related function should work. This
commit needs some more testing.
---
 runtime/datetime.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 20ca6191..aa1956d7 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -62,9 +62,14 @@ DEFobjCurrIf(errmsg)
  * most portable and removes the need for additional structures
  * (but I have to admit it is somewhat "bulky";)).
  *
- * Obviously, all caller-provided pointers must not be NULL...
+ * Obviously, *t must not be NULL...
+ *
+ * rgerhards, 2008-10-07: added ttSeconds to provide a way to 
+ * obtain the second-resolution UNIX timestamp. This is needed
+ * in some situations to minimize time() calls (namely when doing
+ * output processing). This can be left NULL if not needed.
  */
-static void getCurrTime(struct syslogTime *t)
+static void getCurrTime(struct syslogTime *t, time_t *ttSeconds)
 {
 	struct timeval tp;
 	struct tm *tm;
@@ -83,6 +88,9 @@ static void getCurrTime(struct syslogTime *t)
 #	else
 		gettimeofday(&tp, NULL);
 #	endif
+	if(ttSeconds != NULL)
+		*ttSeconds = tp.tv_sec;
+
 	tm = localtime_r((time_t*) &(tp.tv_sec), &tmBuf);
 
 	t->year = tm->tm_year + 1900;
-- 
cgit v1.2.3


From afd425232f3198e7bb6f3dbcf0aa3cb4c24d5f7e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 18 Nov 2008 13:46:38 +0100
Subject: enhanced legacy syslog parser to detect year if part of the timestamp

The format is based on what Cisco devices seem to emit.
---
 runtime/datetime.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index aa1956d7..676f76d5 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -312,6 +312,7 @@ ParseTIMESTAMP3164(struct syslogTime *pTime, char** ppszTS)
 	/* variables to temporarily hold time information while we parse */
 	int month;
 	int day;
+	int year = 0; /* 0 means no year provided */
 	int hour; /* 24 hour clock */
 	int minute;
 	int second;
@@ -472,7 +473,23 @@ ParseTIMESTAMP3164(struct syslogTime *pTime, char** ppszTS)
 
 	if(*pszTS++ != ' ')
 		ABORT_FINALIZE(RS_RET_INVLD_TIME);
+
+	/* time part */
 	hour = srSLMGParseInt32(&pszTS);
+	if(hour > 1970 && hour < 2100) {
+		/* if so, we assume this actually is a year. This is a format found
+		 * e.g. in Cisco devices.
+		 * (if you read this 2100+ trying to fix a bug, congratulate myself
+		 * to how long the code survived - me no longer ;)) -- rgerhards, 2008-11-18
+		 */
+		year = hour;
+
+		/* re-query the hour, this time it must be valid */
+		if(*pszTS++ != ' ')
+			ABORT_FINALIZE(RS_RET_INVLD_TIME);
+		hour = srSLMGParseInt32(&pszTS);
+	}
+
 	if(hour < 0 || hour > 23)
 		ABORT_FINALIZE(RS_RET_INVLD_TIME);
 
@@ -502,6 +519,8 @@ ParseTIMESTAMP3164(struct syslogTime *pTime, char** ppszTS)
 	*ppszTS = pszTS; /* provide updated parse position back to caller */
 	pTime->timeType = 1;
 	pTime->month = month;
+	if(year > 0)
+		pTime->year = year; /* persist year if detected */
 	pTime->day = day;
 	pTime->hour = hour;
 	pTime->minute = minute;
-- 
cgit v1.2.3


From 04b06af335bedcb651ccffd852863b7d17bf20dc Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 3 Apr 2009 18:20:52 +0200
Subject: improved parser test suite

new tests added, now much better
---
 runtime/datetime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 676f76d5..deb66eb4 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -479,7 +479,7 @@ ParseTIMESTAMP3164(struct syslogTime *pTime, char** ppszTS)
 	if(hour > 1970 && hour < 2100) {
 		/* if so, we assume this actually is a year. This is a format found
 		 * e.g. in Cisco devices.
-		 * (if you read this 2100+ trying to fix a bug, congratulate myself
+		 * (if you read this 2100+ trying to fix a bug, congratulate me
 		 * to how long the code survived - me no longer ;)) -- rgerhards, 2008-11-18
 		 */
 		year = hour;
-- 
cgit v1.2.3


From aba90e82484118f3568ec51c01de5ba845da589a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 22 May 2009 17:06:52 +0200
Subject: added capability to run multiple tcp listeners (on different ports)

Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
---
 runtime/datetime.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index deb66eb4..19e61a0a 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -150,7 +150,7 @@ static void getCurrTime(struct syslogTime *t, time_t *ttSeconds)
  * \retval The number parsed.
  */
 
-static int srSLMGParseInt32(char** ppsz)
+static int srSLMGParseInt32(uchar** ppsz)
 {
 	int i;
 
@@ -172,9 +172,9 @@ static int srSLMGParseInt32(char** ppsz)
  * could be obtained (restriction added 2008-09-16 by rgerhards).
  */
 static rsRetVal
-ParseTIMESTAMP3339(struct syslogTime *pTime, char** ppszTS)
+ParseTIMESTAMP3339(struct syslogTime *pTime, uchar** ppszTS)
 {
-	char *pszTS = *ppszTS;
+	uchar *pszTS = *ppszTS;
 	/* variables to temporarily hold time information while we parse */
 	int year;
 	int month;
@@ -234,7 +234,7 @@ ParseTIMESTAMP3339(struct syslogTime *pTime, char** ppszTS)
 
 	/* Now let's see if we have secfrac */
 	if(*pszTS == '.') {
-		char *pszStart = ++pszTS;
+		uchar *pszStart = ++pszTS;
 		secfrac = srSLMGParseInt32(&pszTS);
 		secfracPrecision = (int) (pszTS - pszStart);
 	} else {
@@ -307,7 +307,7 @@ finalize_it:
  * time() call reduction ;).
  */
 static rsRetVal
-ParseTIMESTAMP3164(struct syslogTime *pTime, char** ppszTS)
+ParseTIMESTAMP3164(struct syslogTime *pTime, uchar** ppszTS)
 {
 	/* variables to temporarily hold time information while we parse */
 	int month;
@@ -317,7 +317,7 @@ ParseTIMESTAMP3164(struct syslogTime *pTime, char** ppszTS)
 	int minute;
 	int second;
 	/* end variables to temporarily hold time information while we parse */
-	char *pszTS;
+	uchar *pszTS;
 	DEFiRet;
 
 	assert(ppszTS != NULL);
-- 
cgit v1.2.3


From f7579e68a67364c8040966be57c2eae4c9550ee5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 16 Jun 2009 11:36:05 +0200
Subject: done various optimizations to the stringbuf and its users

---
 runtime/datetime.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 19e61a0a..40ab4e9c 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -152,11 +152,10 @@ static void getCurrTime(struct syslogTime *t, time_t *ttSeconds)
 
 static int srSLMGParseInt32(uchar** ppsz)
 {
-	int i;
+	register int i;
 
 	i = 0;
-	while(isdigit((int) **ppsz))
-	{
+	while(isdigit((int) **ppsz)) {
 		i = i * 10 + **ppsz - '0';
 		++(*ppsz);
 	}
-- 
cgit v1.2.3


From dc603a3dbf0bc0654830e7830a07816c23c85ce5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 09:58:33 +0200
Subject: optimized rfc3339 timestamp string generation

---
 runtime/datetime.c | 103 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 30 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 40ab4e9c..eac55083 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -616,6 +616,18 @@ int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 }
 
 
+static char *const_number_str[100] =
+	{ "00", "01", "02", "00", "04", "05", "06", "07", "08", "09",
+	  "10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
+	  "20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
+	  "30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
+	  "40", "41", "42", "43", "44", "45", "46", "47", "48", "49",
+	  "50", "51", "52", "53", "54", "55", "56", "57", "58", "59",
+	  "60", "61", "62", "63", "64", "65", "66", "67", "68", "69",
+	  "70", "71", "72", "73", "74", "75", "76", "77", "78", "79",
+	  "80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
+	  "90", "91", "92", "93", "94", "95", "96", "97", "98", "99",
+	};
 /**
  * Format a syslogTimestamp to a RFC3339 timestamp string (as
  * specified in syslog-protocol).
@@ -626,46 +638,77 @@ int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
  */
 int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 {
-	int iRet;
-	char szTZ[7]; /* buffer for TZ information */
+	int iBuf;
+	int power;
+	int secfrac;
+	short digit;
 
+	/* the following table of ten powers saves us some computation */
+	static const int tenPowers[6] = { 1, 10, 100, 1000, 10000, 100000 };
+
+	BEGINfunc
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	
-	if(iLenBuf < 20)
+	if(iLenBuf < 33)
 		return(0); /* we NEED at least 20 bytes */
 
-	/* do TZ information first, this is easier to take care of "Z" zone in rfc3339 */
+	/* start with fixed parts */
+	/* year yyyy */
+	pBuf[0] = (ts->year / 1000) % 10 + '0';
+	pBuf[1] = (ts->year / 100) % 10 + '0';
+	pBuf[2] = (ts->year / 10) % 10 + '0';
+	pBuf[3] = ts->year % 10 + '0';
+	pBuf[4] = '-';
+	/* month */
+	pBuf[5] = (ts->month / 10) % 10 + '0';
+	pBuf[6] = ts->month % 10 + '0';
+	pBuf[7] = '-';
+	/* day */
+	pBuf[8] = (ts->day / 10) % 10 + '0';
+	pBuf[9] = ts->day % 10 + '0';
+	pBuf[10] = 'T';
+	/* hour */
+	pBuf[11] = (ts->hour / 10) % 10 + '0';
+	pBuf[12] = ts->hour % 10 + '0';
+	pBuf[13] = '-';
+	/* minute */
+	pBuf[14] = (ts->minute / 10) % 10 + '0';
+	pBuf[15] = ts->minute % 10 + '0';
+	pBuf[16] = '-';
+	/* second */
+	pBuf[17] = (ts->second / 10) % 10 + '0';
+	pBuf[18] = ts->second % 10 + '0';
+
+	iBuf = 19; /* points to next free entry, now it becomes dynamic! */
+
+	if(ts->secfracPrecision > 0) {
+		pBuf[iBuf++] = '.';
+		power = tenPowers[(ts->secfracPrecision - 1) % 6];
+		secfrac = ts->secfrac;
+		while(power > 0) {
+			digit = secfrac / power;
+			secfrac -= digit * power;
+			power /= 10;
+			pBuf[iBuf++] = digit + '0';
+		}
+	}
+
 	if(ts->OffsetMode == 'Z') {
-		szTZ[0] = 'Z';
-		szTZ[1] = '\0';
+		pBuf[iBuf++] = 'Z';
 	} else {
-		snprintf(szTZ, sizeof(szTZ) / sizeof(char), "%c%2.2d:%2.2d",
-			ts->OffsetMode, ts->OffsetHour, ts->OffsetMinute);
+		pBuf[iBuf++] = ts->OffsetMode;
+		pBuf[iBuf++] = (ts->OffsetHour / 10) % 10 + '0';
+		pBuf[iBuf++] = ts->OffsetHour % 10 + '0';
+		pBuf[iBuf++] = ':';
+		pBuf[iBuf++] = (ts->OffsetMinute / 10) % 10 + '0';
+		pBuf[iBuf++] = ts->OffsetMinute % 10 + '0';
 	}
 
-	if(ts->secfracPrecision > 0)
-	{	/* we now need to include fractional seconds. While doing so, we must look at
-		 * the precision specified. For example, if we have millisec precision (3 digits), a
-		 * secFrac value of 12 is not equivalent to ".12" but ".012". Obviously, this
-		 * is a huge difference ;). To avoid this, we first create a format string with
-		 * the specific precision and *then* use that format string to do the actual
-		 * formating (mmmmhhh... kind of self-modifying code... ;)).
-		 */
-		char szFmtStr[64];
-		/* be careful: there is ONE actual %d in the format string below ;) */
-		snprintf(szFmtStr, sizeof(szFmtStr),
-		         "%%04d-%%02d-%%02dT%%02d:%%02d:%%02d.%%0%dd%%s",
-			ts->secfracPrecision);
-		iRet = snprintf(pBuf, iLenBuf, szFmtStr, ts->year, ts->month, ts->day,
-			        ts->hour, ts->minute, ts->second, ts->secfrac, szTZ);
-	}
-	else
-		iRet = snprintf(pBuf, iLenBuf,
-		 		"%4.4d-%2.2d-%2.2dT%2.2d:%2.2d:%2.2d%s",
-				ts->year, ts->month, ts->day,
-			        ts->hour, ts->minute, ts->second, szTZ);
-	return(iRet);
+	pBuf[iBuf] = '\0';
+
+	ENDfunc
+	return iBuf;
 }
 
 /**
-- 
cgit v1.2.3


From 77c992e2155420702460e835ce2d561cf2d10fcb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 11:30:57 +0200
Subject: fully optimized datetime module and enhanced test suite

tests for the various timestamp formats have been added
---
 runtime/datetime.c | 166 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 88 insertions(+), 78 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index eac55083..114bd27f 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -49,6 +49,8 @@
 DEFobjStaticHelpers
 DEFobjCurrIf(errmsg)
 
+/* the following table of ten powers saves us some computation */
+static const int tenPowers[6] = { 1, 10, 100, 1000, 10000, 100000 };
 
 /* ------------------------------ methods ------------------------------ */
 
@@ -544,7 +546,7 @@ finalize_it:
  * returns the size of the timestamp written in bytes (without
  * the string terminator). If 0 is returend, an error occured.
  */
-int formatTimestampToMySQL(struct syslogTime *ts, char* pDst, size_t iLenDst)
+int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
 {
 	/* currently we do not consider localtime/utc. This may later be
 	 * added. If so, I recommend using a property replacer option
@@ -553,28 +555,60 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pDst, size_t iLenDst)
 	 * rgerhards, 2007-06-26
 	 */
 	assert(ts != NULL);
-	assert(pDst != NULL);
+	assert(pBuf != NULL);
 
-	if (iLenDst < 15) /* we need at least 14 bytes
-			     14 digits for timestamp + '\n' */
+	if (iLenDst < 15) /* we need at least 14 bytes */
 		return(0); 
 
-	return(snprintf(pDst, iLenDst, "%4.4d%2.2d%2.2d%2.2d%2.2d%2.2d", 
-		ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second));
+	pBuf[0] = (ts->year / 1000) % 10 + '0';
+	pBuf[1] = (ts->year / 100) % 10 + '0';
+	pBuf[2] = (ts->year / 10) % 10 + '0';
+	pBuf[3] = ts->year % 10 + '0';
+	pBuf[4] = (ts->month / 10) % 10 + '0';
+	pBuf[5] = ts->month % 10 + '0';
+	pBuf[6] = (ts->day / 10) % 10 + '0';
+	pBuf[7] = ts->day % 10 + '0';
+	pBuf[8] = (ts->hour / 10) % 10 + '0';
+	pBuf[9] = ts->hour % 10 + '0';
+	pBuf[10] = (ts->minute / 10) % 10 + '0';
+	pBuf[11] = ts->minute % 10 + '0';
+	pBuf[12] = (ts->second / 10) % 10 + '0';
+	pBuf[13] = ts->second % 10 + '0';
+	pBuf[14] = '\0';
+	return 15;
 
 }
 
-int formatTimestampToPgSQL(struct syslogTime *ts, char *pDst, size_t iLenDst)
+int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
 {
        /* see note in formatTimestampToMySQL, applies here as well */
        assert(ts != NULL);
-       assert(pDst != NULL);
+       assert(pBuf != NULL);
 
-       if (iLenDst < 21) /* we need 20 bytes + '\n' */
-               return(0);
+	if (iLenDst < 20) /* we need 20 bytes */
+		return(0);
 
-       return(snprintf(pDst, iLenDst, "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d",
-                               ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second));
+	pBuf[0] = (ts->year / 1000) % 10 + '0';
+	pBuf[1] = (ts->year / 100) % 10 + '0';
+	pBuf[2] = (ts->year / 10) % 10 + '0';
+	pBuf[3] = ts->year % 10 + '0';
+	pBuf[4] = '-';
+	pBuf[5] = (ts->month / 10) % 10 + '0';
+	pBuf[6] = ts->month % 10 + '0';
+	pBuf[7] = '-';
+	pBuf[8] = (ts->day / 10) % 10 + '0';
+	pBuf[9] = ts->day % 10 + '0';
+	pBuf[10] = ' ';
+	pBuf[11] = (ts->hour / 10) % 10 + '0';
+	pBuf[12] = ts->hour % 10 + '0';
+	pBuf[13] = ':';
+	pBuf[14] = (ts->minute / 10) % 10 + '0';
+	pBuf[15] = ts->minute % 10 + '0';
+	pBuf[16] = ':';
+	pBuf[17] = (ts->second / 10) % 10 + '0';
+	pBuf[18] = ts->second % 10 + '0';
+	pBuf[19] = '\0';
+	return 19;
 }
 
 
@@ -589,45 +623,35 @@ int formatTimestampToPgSQL(struct syslogTime *ts, char *pDst, size_t iLenDst)
  */
 int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 {
-	int lenRet;
-	char szFmtStr[64];
+	int iBuf;
+	int power;
+	int secfrac;
+	short digit;
 
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	assert(iLenBuf >= 10);
 
+	iBuf = 0;
 	if(ts->secfracPrecision > 0)
-	{	/* We must look at
-		 * the precision specified. For example, if we have millisec precision (3 digits), a
-		 * secFrac value of 12 is not equivalent to ".12" but ".012". Obviously, this
-		 * is a huge difference ;). To avoid this, we first create a format string with
-		 * the specific precision and *then* use that format string to do the actual formating.
-		 */
-		/* be careful: there is ONE actual %d in the format string below ;) */
-		snprintf(szFmtStr, sizeof(szFmtStr), "%%0%dd", ts->secfracPrecision);
-		lenRet = snprintf(pBuf, iLenBuf, szFmtStr, ts->secfrac);
+	{	
+		power = tenPowers[(ts->secfracPrecision - 1) % 6];
+		secfrac = ts->secfrac;
+		while(power > 0) {
+			digit = secfrac / power;
+			secfrac -= digit * power;
+			power /= 10;
+			pBuf[iBuf++] = digit + '0';
+		}
 	} else {
-		pBuf[0] = '0';
-		pBuf[1] = '\0';
-		lenRet = 1;
+		pBuf[iBuf++] = '0';
 	}
+	pBuf[iBuf] = '\0';
 
-	return(lenRet);
+	return iBuf;
 }
 
 
-static char *const_number_str[100] =
-	{ "00", "01", "02", "00", "04", "05", "06", "07", "08", "09",
-	  "10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
-	  "20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
-	  "30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
-	  "40", "41", "42", "43", "44", "45", "46", "47", "48", "49",
-	  "50", "51", "52", "53", "54", "55", "56", "57", "58", "59",
-	  "60", "61", "62", "63", "64", "65", "66", "67", "68", "69",
-	  "70", "71", "72", "73", "74", "75", "76", "77", "78", "79",
-	  "80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
-	  "90", "91", "92", "93", "94", "95", "96", "97", "98", "99",
-	};
 /**
  * Format a syslogTimestamp to a RFC3339 timestamp string (as
  * specified in syslog-protocol).
@@ -643,15 +667,10 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	int secfrac;
 	short digit;
 
-	/* the following table of ten powers saves us some computation */
-	static const int tenPowers[6] = { 1, 10, 100, 1000, 10000, 100000 };
-
 	BEGINfunc
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	
-	if(iLenBuf < 33)
-		return(0); /* we NEED at least 20 bytes */
+	assert(iLenBuf < 33);
 
 	/* start with fixed parts */
 	/* year yyyy */
@@ -671,11 +690,11 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	/* hour */
 	pBuf[11] = (ts->hour / 10) % 10 + '0';
 	pBuf[12] = ts->hour % 10 + '0';
-	pBuf[13] = '-';
+	pBuf[13] = ':';
 	/* minute */
 	pBuf[14] = (ts->minute / 10) % 10 + '0';
 	pBuf[15] = ts->minute % 10 + '0';
-	pBuf[16] = '-';
+	pBuf[16] = ':';
 	/* second */
 	pBuf[17] = (ts->second / 10) % 10 + '0';
 	pBuf[18] = ts->second % 10 + '0';
@@ -720,44 +739,36 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
  */
 int formatTimestamp3164(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 {
-	static char* monthNames[13] = {"ERR", "Jan", "Feb", "Mar",
-	                               "Apr", "May", "Jun", "Jul",
-				       "Aug", "Sep", "Oct", "Nov", "Dec"};
+	static char* monthNames[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+					"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+	int iDay;
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	
 	if(iLenBuf < 16)
 		return(0); /* we NEED 16 bytes */
-	return(snprintf(pBuf, iLenBuf, "%s %2d %2.2d:%2.2d:%2.2d",
-		monthNames[ts->month], ts->day, ts->hour,
-		ts->minute, ts->second
-		));
-}
 
-/**
- * Format a syslogTimestamp to a text format.
- * The caller must provide the timestamp as well as a character
- * buffer that will receive the resulting string. The function
- * returns the size of the timestamp written in bytes (without
- * the string termnator). If 0 is returend, an error occured.
- */
-#if 0 /* This method is currently not called, be we like to preserve it */
-static int formatTimestamp(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
-{
-	assert(ts != NULL);
-	assert(pBuf != NULL);
-	
-	if(ts->timeType == 1) {
-		return(formatTimestamp3164(ts, pBuf, iLenBuf));
-	}
+	pBuf[0] = monthNames[(ts->month - 1)% 12][0];
+	pBuf[1] = monthNames[(ts->month - 1) % 12][1];
+	pBuf[2] = monthNames[(ts->month - 1) % 12][2];
+	pBuf[3] = ' ';
+	iDay = (ts->day / 10) % 10; /* we need to write a space if the first digit is 0 */
+	pBuf[4] = iDay ? iDay + '0' : ' ';
+	pBuf[5] = ts->day % 10 + '0';
+	pBuf[6] = ' ';
+	pBuf[7] = (ts->hour / 10) % 10 + '0';
+	pBuf[8] = ts->hour % 10 + '0';
+	pBuf[9] = ':';
+	pBuf[10] = (ts->minute / 10) % 10 + '0';
+	pBuf[11] = ts->minute % 10 + '0';
+	pBuf[12] = ':';
+	pBuf[13] = (ts->second / 10) % 10 + '0';
+	pBuf[14] = ts->second % 10 + '0';
+	pBuf[15] = '\0';
+	return 16;	/* traditional: number of bytes written */
+}
 
-	if(ts->timeType == 2) {
-		return(formatTimestamp3339(ts, pBuf, iLenBuf));
-	}
 
-	return(0);
-}
-#endif
 /* queryInterface function
  * rgerhards, 2008-03-05
  */
@@ -791,7 +802,6 @@ ENDobjQueryInterface(datetime)
 BEGINAbstractObjClassInit(datetime, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-
 ENDObjClassInit(datetime)
 
 /* vi:set ai:
-- 
cgit v1.2.3


From 11cb1e008bfb932a159cc746c5d435ae9518ed19 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 11:45:21 +0200
Subject: some cleanup

---
 runtime/datetime.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 114bd27f..30f397ff 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -556,9 +556,7 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
 	 */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-
-	if (iLenDst < 15) /* we need at least 14 bytes */
-		return(0); 
+	assert(iLenDst < 15);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -581,12 +579,10 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
 
 int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
 {
-       /* see note in formatTimestampToMySQL, applies here as well */
-       assert(ts != NULL);
-       assert(pBuf != NULL);
-
-	if (iLenDst < 20) /* we need 20 bytes */
-		return(0);
+	/* see note in formatTimestampToMySQL, applies here as well */
+	assert(ts != NULL);
+	assert(pBuf != NULL);
+	assert(iLenDst < 20):
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -745,8 +741,7 @@ int formatTimestamp3164(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	
-	if(iLenBuf < 16)
-		return(0); /* we NEED 16 bytes */
+	assert(iLenBuf < 16);
 
 	pBuf[0] = monthNames[(ts->month - 1)% 12][0];
 	pBuf[1] = monthNames[(ts->month - 1) % 12][1];
-- 
cgit v1.2.3


From dd53709083f3671ac711d5d2cb03bfd9c80a7cf3 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 11:58:30 +0200
Subject: typo fix

---
 runtime/datetime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 30f397ff..b5514e7c 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -582,7 +582,7 @@ int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
 	/* see note in formatTimestampToMySQL, applies here as well */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst < 20):
+	assert(iLenDst < 20);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
-- 
cgit v1.2.3


From 3abf567d2b57014381eda49018a0e2c21fa1b853 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 16:07:17 +0200
Subject: optimized template string generation

---
 runtime/datetime.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index b5514e7c..8f4bfa10 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -556,7 +556,7 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
 	 */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst < 15);
+	assert(iLenDst >= 15);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -582,7 +582,7 @@ int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
 	/* see note in formatTimestampToMySQL, applies here as well */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst < 20);
+	assert(iLenDst >= 20);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -666,7 +666,7 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	BEGINfunc
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenBuf < 33);
+	assert(iLenBuf >= 33);
 
 	/* start with fixed parts */
 	/* year yyyy */
@@ -741,7 +741,7 @@ int formatTimestamp3164(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	
-	assert(iLenBuf < 16);
+	assert(iLenBuf >= 16);
 
 	pBuf[0] = monthNames[(ts->month - 1)% 12][0];
 	pBuf[1] = monthNames[(ts->month - 1) % 12][1];
-- 
cgit v1.2.3


From 221dc8a3224dcb59a7dd3158716a8d24cee71618 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 22 Jun 2009 18:19:10 +0200
Subject: some more optimizations of the msg_t object (minor)

---
 runtime/datetime.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index 8f4bfa10..c0e145af 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -614,10 +614,10 @@ int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
  * buffer that will receive the resulting string. The function
  * returns the size of the timestamp written in bytes (without
  * the string terminator). If 0 is returend, an error occured.
- * The buffer must be at least 10 bytes large.
+ * The buffer must be at least 7 bytes large.
  * rgerhards, 2008-06-06
  */
-int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
+int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf)
 {
 	int iBuf;
 	int power;
@@ -626,7 +626,6 @@ int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
 
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenBuf >= 10);
 
 	iBuf = 0;
 	if(ts->secfracPrecision > 0)
-- 
cgit v1.2.3


From 46435e2c3b2ca31aca641aba290173142fae540c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 25 Jun 2009 15:33:49 +0200
Subject: cleanup (removed now-unused parameters)

---
 runtime/datetime.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index c0e145af..e0f3f5fa 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -546,7 +546,7 @@ finalize_it:
  * returns the size of the timestamp written in bytes (without
  * the string terminator). If 0 is returend, an error occured.
  */
-int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
+int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf)
 {
 	/* currently we do not consider localtime/utc. This may later be
 	 * added. If so, I recommend using a property replacer option
@@ -577,7 +577,7 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf, size_t iLenDst)
 
 }
 
-int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf, size_t iLenDst)
+int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf)
 {
 	/* see note in formatTimestampToMySQL, applies here as well */
 	assert(ts != NULL);
@@ -655,7 +655,7 @@ int formatTimestampSecFrac(struct syslogTime *ts, char* pBuf)
  * returns the size of the timestamp written in bytes (without
  * the string terminator). If 0 is returend, an error occured.
  */
-int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
+int formatTimestamp3339(struct syslogTime *ts, char* pBuf)
 {
 	int iBuf;
 	int power;
@@ -732,7 +732,7 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
  * returns the size of the timestamp written in bytes (without
  * the string termnator). If 0 is returend, an error occured.
  */
-int formatTimestamp3164(struct syslogTime *ts, char* pBuf, size_t iLenBuf)
+int formatTimestamp3164(struct syslogTime *ts, char* pBuf)
 {
 	static char* monthNames[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
 					"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-- 
cgit v1.2.3


From de84a12f8a5f140c0f7b8e00f4cac92ef13cd866 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 29 Jun 2009 16:53:26 +0200
Subject: introduced the idea of detached properties

some things inside the message can be used over a large number of
messages and need to to be allocated and re-written every time. I now
begin to implement this as a "prop_t" object, first use for the inputName.
Some input modules are already converted, some others to go. Will do
a little performance check on the new method before I go further.

Also, this commit has some cleanup and a few bug fixes that prevented
compiliation in debug mode (I overlooked this as I did not compile
for debug, what I normally do, and the automatted test also does not
do that)
---
 runtime/datetime.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index e0f3f5fa..ea67eec5 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -556,7 +556,6 @@ int formatTimestampToMySQL(struct syslogTime *ts, char* pBuf)
 	 */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst >= 15);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -582,7 +581,6 @@ int formatTimestampToPgSQL(struct syslogTime *ts, char *pBuf)
 	/* see note in formatTimestampToMySQL, applies here as well */
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenDst >= 20);
 
 	pBuf[0] = (ts->year / 1000) % 10 + '0';
 	pBuf[1] = (ts->year / 100) % 10 + '0';
@@ -665,7 +663,6 @@ int formatTimestamp3339(struct syslogTime *ts, char* pBuf)
 	BEGINfunc
 	assert(ts != NULL);
 	assert(pBuf != NULL);
-	assert(iLenBuf >= 33);
 
 	/* start with fixed parts */
 	/* year yyyy */
@@ -740,8 +737,6 @@ int formatTimestamp3164(struct syslogTime *ts, char* pBuf)
 	assert(ts != NULL);
 	assert(pBuf != NULL);
 	
-	assert(iLenBuf >= 16);
-
 	pBuf[0] = monthNames[(ts->month - 1)% 12][0];
 	pBuf[1] = monthNames[(ts->month - 1) % 12][1];
 	pBuf[2] = monthNames[(ts->month - 1) % 12][2];
-- 
cgit v1.2.3


From f03b26b550dc7a08f96753c47e8fb0673f5338ec Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 3 Jul 2009 10:33:35 +0200
Subject: bugfix: missing initialization during timestamp creation

This could lead to timestamps written in the wrong format, but not to
an abort.
---
 runtime/datetime.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/datetime.c')

diff --git a/runtime/datetime.c b/runtime/datetime.c
index ea67eec5..2db1d3c5 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -123,6 +123,7 @@ static void getCurrTime(struct syslogTime *t, time_t *ttSeconds)
 		t->OffsetMode = '+';
 	t->OffsetHour = lBias / 3600;
 	t->OffsetMinute = lBias % 3600;
+	t->timeType = TIME_TYPE_RFC5424; /* we have a high precision timestamp */
 }
 
 
-- 
cgit v1.2.3