diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-24 06:19:13 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-24 06:19:13 +0100 |
| commit | 0d71694fb3cbff71d504769e0e70a58ebe5f9a0d (patch) | |
| tree | d36030df25a095ac84a196a466f12456b3f855cb /tools/syslogd.c | |
| parent | 6b4d9afccb4297face53fd6bec0fb30b6a8da1c3 (diff) | |
| download | rsyslog-0d71694fb3cbff71d504769e0e70a58ebe5f9a0d.tar.gz rsyslog-0d71694fb3cbff71d504769e0e70a58ebe5f9a0d.tar.bz2 rsyslog-0d71694fb3cbff71d504769e0e70a58ebe5f9a0d.zip | |
optimize: have dns cache pre-create rsyslog prop_t's
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 4f3bad67..e33c2f4b 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -502,8 +502,7 @@ static inline rsRetVal preprocessBatch(batch_t *pBatch) { uchar fromHost[NI_MAXHOST]; uchar fromHostFQDN[NI_MAXHOST]; - uchar *fromHostIP; - rs_size_t lenIP; + prop_t *ip; prop_t *propFromHost = NULL; prop_t *propFromHostIP = NULL; int bSingleRuleset; @@ -521,7 +520,7 @@ preprocessBatch(batch_t *pBatch) { pMsg = pBatch->pElem[i].pMsg; if((pMsg->msgFlags & NEEDS_ACLCHK_U) != 0) { DBGPRINTF("msgConsumer: UDP ACL must be checked for message (hostname-based)\n"); - if(net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN, &fromHostIP, &lenIP) != RS_RET_OK) + if(net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN, &ip) != RS_RET_OK) continue; bIsPermitted = net.isAllowedSender2((uchar*)"UDP", (struct sockaddr *)pMsg->rcvFrom.pfrominet, (char*)fromHostFQDN, 1); @@ -532,7 +531,7 @@ preprocessBatch(batch_t *pBatch) { } else { /* save some of the info we obtained */ MsgSetRcvFromStr(pMsg, fromHost, ustrlen(fromHost), &propFromHost); - CHKiRet(MsgSetRcvFromIPStr(pMsg, fromHostIP, lenIP, &propFromHostIP)); + CHKiRet(MsgSetRcvFromIP(pMsg, ip)); pMsg->msgFlags &= ~NEEDS_ACLCHK_U; } } |