diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:06:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:06:40 +0200 |
| commit | d30526568c77ceddedd47dd0c309c2224bb74ba0 (patch) | |
| tree | 97cb544c815fc5f91846a9ef4fb0109513efccbc /plugins | |
| parent | e6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (diff) | |
| parent | 73cc2afb2246a0339fdadde4f2bf66120bcae20f (diff) | |
| download | rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.tar.gz rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.tar.xz rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.zip | |
Merge branch 'v3-stable' into v4-beta
Conflicts:
plugins/imrelp/imrelp.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; |