Merge branch 'v6-stable' into beta

2 files changed, 11 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 66c87879..d9544bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -168,7 +168,11 @@ Version 6.5.0  [devel] 2012-08-28
   http://bugzilla.adiscon.com/show_bug.cgi?id=353
 ---------------------------------------------------------------------------
 Version 6.4.3  [V6-STABLE] 2012-??-??
-- change lumberjack cookie to "@cee" from "@cee "
+- bugfix: imuxsock truncated head of received message
+  This happened only under some circumstances. Thanks to Marius
+  Tomaschwesky, Florian Piekert and Milan Bartos for their help in
+  solving this issue.
+- change lumberjack cookie to "@cee:" from "@cee: "
   CEE originally specified the cookie with SP, whereas other lumberjack
   tools used it without space. In order to keep interop with lumberjack,
   we now use the cookie without space as well. I hope this can be changed
@@ -749,6 +753,10 @@ expected that interfaces, even new ones, break during the initial
   [ported from v4]
 ---------------------------------------------------------------------------
 Version 5.10.1  [V5-STABLE], 2012-0?-??
+- bugfix: imuxsock truncated head of received message
+  This happened only under some circumstances. Thanks to Marius
+  Tomaschwesky, Florian Piekert and Milan Bartos for their help in
+  solving this issue.
 - enable DNS resolution in imrelp
   Thanks to Apollon Oikonomopoulos for the patch
 - bugfix: invalid property name in property-filter could cause abort
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index a4933115..79d8c5d0 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -915,7 +915,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
 	CHKiRet(msgConstructWithTime(&pMsg, &st, tt));
 	MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv);
 	parser.SanitizeMsg(pMsg);
-	lenMsg = pMsg->iLenRawMsg - offs;
+	lenMsg = pMsg->iLenRawMsg - offs; /* SanitizeMsg() may have changed the size */
 	MsgSetInputName(pMsg, pInputName);
 	MsgSetFlowControlType(pMsg, pLstn->flowCtl);
 
@@ -952,7 +952,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
 			parse[15] = ' '; /* re-write \0 from fromatTimestamp3164 by SP */
 			/* update "counters" to reflect processed timestamp */
 			parse += 16;
-			lenMsg -= 16;
 		}
 	}
 
@@ -967,12 +966,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
 	if(pLstn->bWritePid)
 		fixPID(bufParseTAG, &i, cred);
 	MsgSetTAG(pMsg, bufParseTAG, i);
-
-	if (pLstn->bAnnotate) {
-		MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg - 16);
-	} else {
-		MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg);
-	}
+	MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg);
 
 	if(pLstn->bParseHost) {
 		pMsg->msgFlags  = pLstn->flags | PARSE_HOSTNAME;