diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 18:10:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 18:10:20 +0100 |
| commit | 2ee2cff538edd5e2b70a03fcef76e25b2072e432 (patch) | |
| tree | 43724318361efc2ebb6cbe037295e09d4796a815 /tcpsrv.c | |
| parent | 1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea (diff) | |
| parent | 4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a (diff) | |
| download | rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.gz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.xz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
plugins/imtcp/imtcp.c
tcpsrv.h
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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); } |