Merge branch 'v4-beta' into beta

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/rsyslog.h
	tcpsrv.c

1 files changed, 19 insertions, 0 deletions

diff --git a/tcpsrv.c b/tcpsrv.c
index 3f445063..49d8a099 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -482,6 +482,14 @@ doReceive(tcpsrv_t *pThis, tcps_sess_t **ppSess)
 	iRet = pThis->pRcvData(*ppSess, buf, sizeof(buf), &iRcvd);
 	switch(iRet) {
 	case RS_RET_CLOSED:
+		if(pThis->bEmitMsgOnClose) {
+			uchar *pszPeer;
+			int lenPeer;
+			errno = 0;
+			prop.GetString((*ppSess)->fromHostIP, &pszPeer, &lenPeer);
+			errmsg.LogError(0, RS_RET_PEER_CLOSED_CONN, "Netstream session %p closed by remote peer %s.\n",
+					(*ppSess)->pStrm, pszPeer);
+		}
 		pThis->pOnRegularClose(*ppSess);
 		tcps_sess.Destruct(ppSess);
 		break;
@@ -794,6 +802,16 @@ SetRuleset(tcpsrv_t *pThis, ruleset_t *pRuleset)
 }
 
 
+/* Set connection close notification */
+static rsRetVal
+SetNotificationOnRemoteClose(tcpsrv_t *pThis, int bNewVal)
+{
+	DEFiRet;
+	pThis->bEmitMsgOnClose = bNewVal;
+	RETiRet;
+}
+
+
 /* here follows a number of methods that shuffle authentication settings down
  * to the drivers. Drivers not supporting these settings may return an error
  * state.
@@ -910,6 +928,7 @@ CODESTARTobjQueryInterface(tcpsrv)
 	pIf->SetCBOnErrClose = SetCBOnErrClose;
 	pIf->SetOnMsgReceive = SetOnMsgReceive;
 	pIf->SetRuleset = SetRuleset;
+	pIf->SetNotificationOnRemoteClose = SetNotificationOnRemoteClose;
 
 finalize_it:
 ENDobjQueryInterface(tcpsrv)