summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-03 09:04:59 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-03 09:04:59 +0000
commit42730360196f1aaafaebb955c1a0a66a185e61ec (patch)
treea372aed0c06905d230ed383249028aa220417a1e /plugins/imtcp
parent9d8eb28ebd941694d8dcbc66c6e5c80cf90a206d (diff)
downloadrsyslog-42730360196f1aaafaebb955c1a0a66a185e61ec.tar.gz
rsyslog-42730360196f1aaafaebb955c1a0a66a185e61ec.tar.xz
rsyslog-42730360196f1aaafaebb955c1a0a66a185e61ec.zip
made imgssapi compile
Diffstat (limited to 'plugins/imtcp')
-rw-r--r--plugins/imtcp/imtcp.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index 9ad85044..efdc3e9c 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -62,28 +62,35 @@ static tcpsrv_t *pOurTcpsrv = NULL; /* our TCP server(listener) TODO: change fo
/* config settings */
static int iTCPSessMax = 200; /* max number of sessions */
-static char *TCPLstnPort = "0"; /* read-only after startup */
/* callbacks */
/* this shall go into a specific ACL module! */
static int
-isPermittedHost(struct sockaddr *addr, char *fromHostFQDN)
+isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((unused)) *pUsrSrv,
+ void __attribute__((unused)) *pUsrSess)
{
return isAllowedSender(pAllowedSenders_TCP, addr, fromHostFQDN);
}
static rsRetVal
-onSessAccept(tcpsrv_t *pThis, int fd)
+onSessAccept(tcpsrv_t *pThis, tcps_sess_t **ppSess, int fd)
{
DEFiRet;
-
- tcpsrv.SessAccept(pThis, fd);
+ tcpsrv.SessAccept(pThis, ppSess, fd);
RETiRet;
}
+static int*
+doOpenLstnSocks(tcpsrv_t *pSrv)
+{
+ ISOBJ_TYPE_assert(pSrv, tcpsrv);
+ return tcpsrv.create_tcp_socket(pSrv);
+}
+
+
static int
doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf)
{
@@ -129,6 +136,7 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa
/* TODO: fill params! */
CHKiRet(tcpsrv.SetCBIsPermittedHost(pOurTcpsrv, isPermittedHost));
CHKiRet(tcpsrv.SetCBRcvData(pOurTcpsrv, doRcvData));
+ CHKiRet(tcpsrv.SetCBOpenLstnSocks(pOurTcpsrv, doOpenLstnSocks));
//CHKiRet(tcpsrv.SetCBOnListenDeinit(pOurTcpsrv, ));
CHKiRet(tcpsrv.SetCBOnSessAccept(pOurTcpsrv, onSessAccept));
CHKiRet(tcpsrv.SetCBOnRegularClose(pOurTcpsrv, onRegularClose));
@@ -149,7 +157,6 @@ CODESTARTrunInput
* do that in ConstructFinalize
*/
iRet = tcpsrv.Run(pOurTcpsrv);
- return iRet;
ENDrunInput
@@ -173,6 +180,7 @@ CODESTARTafterRun
}
ENDafterRun
+
BEGINmodExit
CODESTARTmodExit
iRet = tcpsrv.Destruct(&pOurTcpsrv);