diff options
| -rw-r--r-- | dirty.h | 5 | ||||
| -rw-r--r-- | plugins/imdiag/imdiag.c | 2 | ||||
| -rw-r--r-- | plugins/imfile/imfile.c | 2 | ||||
| -rw-r--r-- | plugins/impstats/impstats.c | 2 | ||||
| -rw-r--r-- | plugins/imptcp/imptcp.c | 1 | ||||
| -rw-r--r-- | plugins/imudp/imudp.c | 2 | ||||
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 4 | ||||
| -rw-r--r-- | runtime/ratelimit.c | 2 | ||||
| -rw-r--r-- | tcps_sess.c | 6 | ||||
| -rw-r--r-- | tools/syslogd.c | 23 |
10 files changed, 24 insertions, 25 deletions
@@ -28,13 +28,12 @@ #define DIRTY_H_INCLUDED 1 rsRetVal __attribute__((deprecated)) multiSubmitMsg(multi_submit_t *pMultiSub); +rsRetVal submitMsg2(msg_t *pMsg); rsRetVal __attribute__((deprecated)) submitMsg(msg_t *pMsg); -rsRetVal multiSubmitMsg2(multi_submit_t *pMultiSub, ratelimit_t *ratelimit); -rsRetVal submitMsg2(msg_t *pMsg, ratelimit_t *ratelimit); rsRetVal multiSubmitFlush(multi_submit_t *pMultiSub); rsRetVal multiSubmitAddMsg(multi_submit_t *pMultiSub, msg_t *pMsg, ratelimit_t *ratelimit); rsRetVal logmsgInternal(int iErr, int pri, uchar *msg, int flags); -rsRetVal parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int flags, flowControl_t flowCtlTypeu, prop_t *pInputName, struct syslogTime *stTime, time_t ttGenTime, ruleset_t *pRuleset); +rsRetVal __attribute__((deprecated)) parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int flags, flowControl_t flowCtlTypeu, prop_t *pInputName, struct syslogTime *stTime, time_t ttGenTime, ruleset_t *pRuleset); rsRetVal diagGetMainMsgQSize(int *piSize); /* for imdiag */ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName); diff --git a/plugins/imdiag/imdiag.c b/plugins/imdiag/imdiag.c index 460b8472..09742537 100644 --- a/plugins/imdiag/imdiag.c +++ b/plugins/imdiag/imdiag.c @@ -220,7 +220,7 @@ doInjectMsg(int iNum) pMsg->msgFlags = NEEDS_PARSING | PARSE_HOSTNAME; MsgSetRcvFrom(pMsg, pRcvDummy); CHKiRet(MsgSetRcvFromIP(pMsg, pRcvIPDummy)); - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg(pMsg)); finalize_it: RETiRet; diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 64a7e032..d6e6ad0e 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -191,7 +191,7 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine) MsgSetRuleset(pMsg, pInfo->pRuleset); pInfo->multiSub.ppMsgs[pInfo->multiSub.nElem++] = pMsg; if(pInfo->multiSub.nElem == pInfo->multiSub.maxElem) - CHKiRet(multiSubmitMsg2(&pInfo->multiSub, NULL)); + CHKiRet(multiSubmitMsg(&pInfo->multiSub)); finalize_it: RETiRet; } diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c index ef2bebf7..62599969 100644 --- a/plugins/impstats/impstats.c +++ b/plugins/impstats/impstats.c @@ -138,7 +138,7 @@ doSubmitMsg(uchar *line) pMsg->iSeverity = runModConf->iSeverity; pMsg->msgFlags = 0; - submitMsg2(pMsg, NULL); + submitMsg(pMsg); finalize_it: RETiRet; diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index 6d2ecd2f..e7650812 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -664,7 +664,6 @@ doSubmitMsg(ptcpsess_t *pThis, struct syslogTime *stTime, time_t ttGenTime, mult msg_t *pMsg; ptcpsrv_t *pSrv; DEFiRet; -dbgprintf("DDDD: in imptcp doSubmitMSg()\n"); if(pThis->iMsg == 0) { DBGPRINTF("discarding zero-sized message\n"); diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index c0448cba..0dda30ec 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -383,7 +383,7 @@ processSocket(thrdInfo_t *pThrd, struct lstn_s *lstn, struct sockaddr_storage *f if(*pbIsPermitted == 2) pMsg->msgFlags |= NEEDS_ACLCHK_U; /* request ACL check after resolution */ CHKiRet(msgSetFromSockinfo(pMsg, &frominet)); - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg(pMsg)); STATSCOUNTER_INC(lstn->ctrSubmit, lstn->mutCtrSubmit); } } diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 1ff89353..2f7daf87 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -995,11 +995,11 @@ if(ratelimit == NULL) localRet = ratelimitMsg(pMsg, ratelimit); if(localRet == RS_RET_OK_HAVE_REPMSG) { dbgprintf("DDDD: doing repeat submit!\n"); - CHKiRet(submitMsg2(ratelimitGetRepeatMsg(ratelimit), NULL)); + CHKiRet(submitMsg2(ratelimitGetRepeatMsg(ratelimit))); localRet = RS_RET_OK; } if(localRet == RS_RET_OK) - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg2(pMsg)); STATSCOUNTER_INC(ctrSubmit, mutCtrSubmit); finalize_it: diff --git a/runtime/ratelimit.c b/runtime/ratelimit.c index 03b9631e..e6ea6f4e 100644 --- a/runtime/ratelimit.c +++ b/runtime/ratelimit.c @@ -176,7 +176,7 @@ ratelimitDestruct(ratelimit_t *ratelimit) ratelimit->repMsg = ratelimit->pMsg; pMsg = ratelimitGetRepeatMsg(ratelimit); if(pMsg != NULL) - submitMsg(pMsg); + submitMsg2(pMsg); } } else { msgDestruct(&ratelimit->pMsg); diff --git a/tcps_sess.c b/tcps_sess.c index be06a4e1..bc81c299 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -265,11 +265,11 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG STATSCOUNTER_INC(pThis->pLstnInfo->ctrSubmit, pThis->pLstnInfo->mutCtrSubmit); if(pMultiSub == NULL) { - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg2(pMsg)); } else { pMultiSub->ppMsgs[pMultiSub->nElem++] = pMsg; if(pMultiSub->nElem == pMultiSub->maxElem) - CHKiRet(multiSubmitMsg2(pMultiSub, NULL)); + CHKiRet(multiSubmitMsg(pMultiSub)); } @@ -490,7 +490,7 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen) if(multiSub.nElem > 0) { /* submit anything that was not yet submitted */ - CHKiRet(multiSubmitMsg2(&multiSub, NULL)); + CHKiRet(multiSubmitMsg(&multiSub)); } finalize_it: diff --git a/tools/syslogd.c b/tools/syslogd.c index e8957e13..1eac6ccb 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -418,7 +418,7 @@ parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int fla CHKiRet(prop.Destruct(&pProp)); CHKiRet(MsgSetRcvFromIPStr(pMsg, hnameIP, ustrlen(hnameIP), &pProp)); CHKiRet(prop.Destruct(&pProp)); - CHKiRet(submitMsg2(pMsg, NULL)); + CHKiRet(submitMsg2(pMsg)); finalize_it: RETiRet; @@ -489,7 +489,7 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags) /* we have the queue, so we can simply provide the * message to the queue engine. */ - submitMsg2(pMsg, NULL); + submitMsg2(pMsg); } finalize_it: RETiRet; @@ -625,7 +625,7 @@ int i; * rgerhards, 2008-02-13 */ rsRetVal -submitMsg2(msg_t *pMsg, ratelimit_t *ratelimit) +submitMsg2(msg_t *pMsg) { qqueue_t *pQueue; ruleset_t *pRuleset; @@ -649,10 +649,11 @@ submitMsg2(msg_t *pMsg, ratelimit_t *ratelimit) finalize_it: RETiRet; } + rsRetVal -submitMsg(msg_t *pMsg) /* backward compat. level */ +submitMsg(msg_t *pMsg) { - return submitMsg2(pMsg, NULL); + return submitMsg2(pMsg); } @@ -661,7 +662,7 @@ submitMsg(msg_t *pMsg) /* backward compat. level */ * rgerhards, 2009-06-16 */ rsRetVal -multiSubmitMsg2(multi_submit_t *pMultiSub, ratelimit_t *ratelimit) +multiSubmitMsg2(multi_submit_t *pMultiSub) { int i; qqueue_t *pQueue; @@ -695,7 +696,7 @@ finalize_it: rsRetVal multiSubmitMsg(multi_submit_t *pMultiSub) /* backward compat. level */ { - return multiSubmitMsg2(pMultiSub, NULL); + return multiSubmitMsg2(pMultiSub); } @@ -717,13 +718,13 @@ dbgprintf("DDDD: have multisub!\n"); dbgprintf("DDDD: doing repeat submit!\n"); pMultiSub->ppMsgs[pMultiSub->nElem++] = ratelimitGetRepeatMsg(ratelimit); if(pMultiSub->nElem == pMultiSub->maxElem) - CHKiRet(multiSubmitMsg2(pMultiSub, NULL)); + CHKiRet(multiSubmitMsg2(pMultiSub)); localRet = RS_RET_OK; } if(localRet == RS_RET_OK) { pMultiSub->ppMsgs[pMultiSub->nElem++] = pMsg; if(pMultiSub->nElem == pMultiSub->maxElem) - CHKiRet(multiSubmitMsg2(pMultiSub, NULL)); + CHKiRet(multiSubmitMsg2(pMultiSub)); } } @@ -738,7 +739,7 @@ multiSubmitFlush(multi_submit_t *pMultiSub) DEFiRet; dbgprintf("DDDD: multiSubmitFlish, nElem %d\n", pMultiSub->nElem); if(pMultiSub->nElem > 0) { - iRet = multiSubmitMsg(pMultiSub); + iRet = multiSubmitMsg2(pMultiSub); } RETiRet; } @@ -1322,7 +1323,7 @@ static inline void processImInternal(void) msg_t *pMsg; while(iminternalRemoveMsg(&pMsg) == RS_RET_OK) { - submitMsg2(pMsg, NULL); + submitMsg(pMsg); } } |