rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 08:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-beta' into v4-devel

Browse Source
This commit is contained in:
Rainer Gerhards 2009-10-14 17:15:11 +02:00
commit ad40d586ab
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -416,6 +416,8 @@ version before switching to this one.
Thanks to Ken for providing the patch Thanks to Ken for providing the patch
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
- enhance: imrelp now also provides remote peer's IP address
[if librelp != 1.0.0 is used]
- bugfix: sending syslog messages with zip compression did not work - bugfix: sending syslog messages with zip compression did not work
- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers] - clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
in doc set (require TLS drivers) in doc set (require TLS drivers)

3
doc/imrelp.html
View File

@ -35,6 +35,9 @@ Starts a RELP server on selected port</li>
<b>Caveats/Known Bugs:</b> <b>Caveats/Known Bugs:</b>
<ul> <ul>
<li>see description</li> <li>see description</li>
<li>To obtain the remote system's IP address, you need to have at least
librelp 1.0.0 installed. Versions below it return the hostname instead
of the IP address.</li>
</ul> </ul>
<p><b>Sample:</b></p> <p><b>Sample:</b></p>
<p>This sets up a RELP server on port 20514.<br> <p>This sets up a RELP server on port 20514.<br>

8
plugins/imrelp/imrelp.c
View File

@ -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 * are different from our rsRetVal. So we can simply use our own iRet system
* to fulfill the requirement. * to fulfill the requirement.
* rgerhards, 2008-03-21 * rgerhards, 2008-03-21
* TODO: we currently do not receive the remote hosts's IP. As a work-around, we * Note: librelp 1.0.0 is required in order to receive the IP address, otherwise
* use "???" for the time being. -- rgerhards, 2008-05-16 * we will only see the hostname (twice). -- rgerhards, 2009-10-14
*/ */
static relpRetVal 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; DEFiRet;
parseAndSubmitMessage(pHostname, (uchar*) "[unset]", pMsg, lenMsg, PARSE_HOSTNAME, parseAndSubmitMessage(pHostname, pIP, pMsg, lenMsg, PARSE_HOSTNAME,
eFLOWCTL_LIGHT_DELAY, pInputName, NULL, 0); eFLOWCTL_LIGHT_DELAY, pInputName, NULL, 0);
RETiRet; RETiRet;