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 /plugins/imdiag/imdiag.c | |
| parent | 1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea (diff) | |
| parent | 4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a (diff) | |
| download | rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.gz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.bz2 rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
plugins/imtcp/imtcp.c
tcpsrv.h
Diffstat (limited to 'plugins/imdiag/imdiag.c')
| -rw-r--r-- | plugins/imdiag/imdiag.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/imdiag/imdiag.c b/plugins/imdiag/imdiag.c index b3468921..bcbbab09 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -376,7 +376,8 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa /* initialized, now add socket */ CHKiRet(tcpsrv.SetInputName(pOurTcpsrv, pszInputName == NULL ? UCHAR_CONSTANT("imdiag") : pszInputName)); - tcpsrv.configureTCPListen(pOurTcpsrv, pNewVal); + /* we support octect-cuunted frame (constant 1 below) */ + tcpsrv.configureTCPListen(pOurTcpsrv, pNewVal, 1); finalize_it: if(iRet != RS_RET_OK) { |