diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-15 11:57:53 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-15 11:57:53 +0200 |
commit | 73f83d963bc8084a3efc186a383493cbcbc7886e (patch) | |
tree | 71ba4f9804f3d81a25f8ec2e58ae2389fa1112c5 /plugins | |
parent | c5408da3d8f17691fb91282d031757ed041fec55 (diff) | |
parent | 11c3b7d9e4198396dbe0bfa0308d80901072c673 (diff) | |
download | rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.tar.gz rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.tar.xz rsyslog-73f83d963bc8084a3efc186a383493cbcbc7886e.zip |
Merge branch 'master' into newqueue
Conflicts:
tools/syslogd.c
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/imrelp/imrelp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c index b9e7b2f8..9be38f8f 100644 --- a/plugins/imrelp/imrelp.c +++ b/plugins/imrelp/imrelp.c @@ -81,14 +81,14 @@ isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((u * are different from our rsRetVal. So we can simply use our own iRet system * to fulfill the requirement. * rgerhards, 2008-03-21 - * TODO: we currently do not receive the remote hosts's IP. As a work-around, we - * use "???" for the time being. -- rgerhards, 2008-05-16 + * Note: librelp 1.0.0 is required in order to receive the IP address, otherwise + * we will only see the hostname (twice). -- rgerhards, 2009-10-14 */ static relpRetVal -onSyslogRcv(uchar *pHostname, uchar __attribute__((unused)) *pIP, uchar *pMsg, size_t lenMsg) +onSyslogRcv(uchar *pHostname, uchar *pIP, uchar *pMsg, size_t lenMsg) { DEFiRet; - parseAndSubmitMessage(pHostname, (uchar*) "[unset]", pMsg, lenMsg, PARSE_HOSTNAME, + parseAndSubmitMessage(pHostname, pIP, pMsg, lenMsg, PARSE_HOSTNAME, eFLOWCTL_LIGHT_DELAY, pInputName, NULL, 0); RETiRet; |