summaryrefslogtreecommitdiffstats
path: root/tcpsrv.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-03-19 15:28:25 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-03-19 15:28:25 +0100
commit4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a (patch)
treee585d52baf5a7e4323da7f3b893027c38e9ca3d2 /tcpsrv.c
parent7d516b0a6c46177c18aea30b4617f1d2712d48fd (diff)
downloadrsyslog-4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a.tar.gz
rsyslog-4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a.tar.xz
rsyslog-4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a.zip
added configuration directive to disable octet-counted framing
... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
Diffstat (limited to 'tcpsrv.c')
-rw-r--r--tcpsrv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tcpsrv.c b/tcpsrv.c
index dcf407c0..d5853477 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -100,7 +100,7 @@ DEFobjCurrIf(statsobj)
* rgerhards, 2009-05-21
*/
static inline rsRetVal
-addNewLstnPort(tcpsrv_t *pThis, uchar *pszPort)
+addNewLstnPort(tcpsrv_t *pThis, uchar *pszPort, int bSuppOctetFram)
{
tcpLstnPortList_t *pEntry;
uchar statname[64];
@@ -113,6 +113,7 @@ addNewLstnPort(tcpsrv_t *pThis, uchar *pszPort)
pEntry->pszPort = pszPort;
pEntry->pSrv = pThis;
pEntry->pRuleset = pThis->pRuleset;
+ pEntry->bSuppOctetFram = bSuppOctetFram;
/* we need to create a property */
CHKiRet(prop.Construct(&pEntry->pInputName));
@@ -143,7 +144,7 @@ finalize_it:
* rgerhards, 2008-03-20
*/
static rsRetVal
-configureTCPListen(tcpsrv_t *pThis, uchar *pszPort)
+configureTCPListen(tcpsrv_t *pThis, uchar *pszPort, int bSuppOctetFram)
{
int i;
uchar *pPort = pszPort;
@@ -159,7 +160,7 @@ configureTCPListen(tcpsrv_t *pThis, uchar *pszPort)
}
if(i >= 0 && i <= 65535) {
- CHKiRet(addNewLstnPort(pThis, pszPort));
+ CHKiRet(addNewLstnPort(pThis, pszPort, bSuppOctetFram));
} else {
errmsg.LogError(0, NO_ERRCODE, "Invalid TCP listen port %s - ignored.\n", pszPort);
}