summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-09 13:44:52 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-09 13:44:52 +0200
commita5b4cb1681174ad221a8440422e4cd0da0e32064 (patch)
tree95abe0feed6e106025fc8d85d4ad28a36c06eb34 /plugins/imtcp
parent845c6f59b91e9988f856556cbb0e88e275e8e591 (diff)
parent0cade5118fbf6b7af6f34b53255e4e73b9578176 (diff)
downloadrsyslog-a5b4cb1681174ad221a8440422e4cd0da0e32064.tar.gz
rsyslog-a5b4cb1681174ad221a8440422e4cd0da0e32064.tar.xz
rsyslog-a5b4cb1681174ad221a8440422e4cd0da0e32064.zip
Merge branch 'beta'
Conflicts: ChangeLog tcpsrv.c tcpsrv.h Note: we have a slight inconsistency, as interface version v4 was already used for tcpsrv in this branch. We accept this inconsistency.
Diffstat (limited to 'plugins/imtcp')
-rw-r--r--plugins/imtcp/imtcp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index 19138d94..5a8a62f6 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -162,6 +162,7 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa
if(pOurTcpsrv == NULL) {
CHKiRet(tcpsrv.Construct(&pOurTcpsrv));
+ CHKiRet(tcpsrv.SetSessMax(pOurTcpsrv, iTCPSessMax));
CHKiRet(tcpsrv.SetCBIsPermittedHost(pOurTcpsrv, isPermittedHost));
CHKiRet(tcpsrv.SetCBRcvData(pOurTcpsrv, doRcvData));
CHKiRet(tcpsrv.SetCBOpenLstnSocks(pOurTcpsrv, doOpenLstnSocks));