diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-18 14:40:41 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-18 14:40:41 +0100 |
| commit | eb5c7a04199028703a328d199c36ac6f5b631ccd (patch) | |
| tree | c0cb250fa64025f0e9a953b2f4c3af62ac1a13eb /tools/syslogd.c | |
| parent | 947cc0a45ddf7144532f37626fa0c547e357e3af (diff) | |
| download | rsyslog-eb5c7a04199028703a328d199c36ac6f5b631ccd.tar.gz rsyslog-eb5c7a04199028703a328d199c36ac6f5b631ccd.tar.bz2 rsyslog-eb5c7a04199028703a328d199c36ac6f5b631ccd.zip | |
optimize: reduce nbr of strcpy() in FROMHOST processing
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index a4b53d1f..4f3bad67 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -501,8 +501,9 @@ finalize_it: static inline rsRetVal preprocessBatch(batch_t *pBatch) { uchar fromHost[NI_MAXHOST]; - uchar fromHostIP[NI_MAXHOST]; uchar fromHostFQDN[NI_MAXHOST]; + uchar *fromHostIP; + rs_size_t lenIP; prop_t *propFromHost = NULL; prop_t *propFromHostIP = NULL; int bSingleRuleset; @@ -520,7 +521,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) != RS_RET_OK) + if(net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN, &fromHostIP, &lenIP) != RS_RET_OK) continue; bIsPermitted = net.isAllowedSender2((uchar*)"UDP", (struct sockaddr *)pMsg->rcvFrom.pfrominet, (char*)fromHostFQDN, 1); @@ -531,7 +532,7 @@ preprocessBatch(batch_t *pBatch) { } else { /* save some of the info we obtained */ MsgSetRcvFromStr(pMsg, fromHost, ustrlen(fromHost), &propFromHost); - CHKiRet(MsgSetRcvFromIPStr(pMsg, fromHostIP, ustrlen(fromHostIP), &propFromHostIP)); + CHKiRet(MsgSetRcvFromIPStr(pMsg, fromHostIP, lenIP, &propFromHostIP)); pMsg->msgFlags &= ~NEEDS_ACLCHK_U; } } |