diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:14:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 17:14:56 +0200 |
| commit | 7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51 (patch) | |
| tree | 4395c114e4bbeb94cbed0f3c7177d148c179989c /plugins | |
| parent | c104eea4e5d0aeb4c87ee23fab8532530d5fe0e9 (diff) | |
| parent | 73cc2afb2246a0339fdadde4f2bf66120bcae20f (diff) | |
| download | rsyslog-7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51.tar.gz rsyslog-7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51.tar.xz rsyslog-7f9db36d9a56a3d2cae2d6cfd97240fad2f85a51.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
plugins/imrelp/imrelp.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imrelp/imrelp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/imrelp/imrelp.c b/plugins/imrelp/imrelp.c index 2255e643..524d1a35 100644 --- a/plugins/imrelp/imrelp.c +++ b/plugins/imrelp/imrelp.c @@ -77,16 +77,15 @@ 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, (uchar*)"imrelp", NULL, 0); - RETiRet; } |