diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
| commit | d6da57ae0370aeb705f63fd04e575b5ed4684618 (patch) | |
| tree | d451907714559f5df60eb0cdef6ccbc205c812e4 /plugins/imdiag | |
| parent | d8ce489bae3ae072a2ee605cd90fa0530c9f3446 (diff) | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| download | rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.gz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.xz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.zip | |
Merge branch 'v5-stable-newstats'
Conflicts:
action.c
configure.ac
doc/imuxsock.html
plugins/imklog/imklog.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
runtime/ruleset.c
tcpsrv.h
tools/syslogd.c
Diffstat (limited to 'plugins/imdiag')
| -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 48573853..6ea615a1 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -381,7 +381,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) { |