From c7dc590f9c6d9cd92a83ad25ca4738ee6bda6c3b Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@redhat.com>
Date: Sat, 5 Mar 2016 20:59:16 +0100
Subject: [PATCH] Fix processing of partial messages over TCP

Commit b0e8ce6c added a new variable to track processing of a single
message split into multiple packets. Several bits of code weren't
ported to the new variable and could cause mishandling.
Messages not terminated by a NL were discarded upon connection
termination.
---
 tcps_sess.c | 5 ++---
 tcps_sess.h | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tcps_sess.c b/tcps_sess.c
index 5821e44..199bece 100644
--- a/tcps_sess.c
+++ b/tcps_sess.c
@@ -69,7 +69,7 @@ static rsRetVal Close(tcps_sess_t *pThis);
 /* Standard-Constructor */
 BEGINobjConstruct(tcps_sess) /* be sure to specify the object type also in END macro! */
 		pThis->iMsg = 0; /* just make sure... */
-		pThis->bAtStrtOfFram = 1; /* indicate frame header expected */
+		pThis->inputState = eAtStrtFram; /* indicate frame header expected */
 		pThis->eFraming = TCP_FRAMING_OCTET_STUFFING; /* just make sure... */
 		/* now allocate the message reception buffer */
 		CHKmalloc(pThis->pMsg = (uchar*) MALLOC(sizeof(uchar) * iMaxLine + 1));
@@ -265,7 +265,6 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG
 
 finalize_it:
 	/* reset status variables */
-	pThis->bAtStrtOfFram = 1;
 	pThis->iMsg = 0;
 
 	RETiRet;
@@ -293,7 +292,7 @@ PrepareClose(tcps_sess_t *pThis)
 
 	ISOBJ_TYPE_assert(pThis, tcps_sess);
 	
-	if(pThis->bAtStrtOfFram == 1) {
+	if(pThis->inputState == eAtStrtFram) {
 		/* this is how it should be. There is no unprocessed
 		 * data left and such we have nothing to do. For simplicity
 		 * reasons, we immediately return in that case.
diff --git a/tcps_sess.h b/tcps_sess.h
index 4506cf0..3e10acf 100644
--- a/tcps_sess.h
+++ b/tcps_sess.h
@@ -35,7 +35,6 @@ struct tcps_sess_s {
 	tcpLstnPortList_t *pLstnInfo;	/* pointer back to listener info */
 	netstrm_t *pStrm;
 	int iMsg;		 /* index of next char to store in msg */
-	sbool bAtStrtOfFram;	/* are we at the very beginning of a new frame? */
 	sbool bSuppOctetFram;	/**< copy from listener, to speed up access */
 	enum {
 		eAtStrtFram,
-- 
2.5.5