Merge branch 'v3-stable' into v4-beta

Conflicts:
	plugins/imrelp/imrelp.c

ChangeLog

@@ -401,6 +401,8 @@ version before switching to this one.
   Thanks to Ken for providing the patch
 ---------------------------------------------------------------------------
 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
 - clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
   in doc set (require TLS drivers)

doc/imrelp.html

@@ -35,6 +35,9 @@ Starts a RELP server on selected port</li>
 <b>Caveats/Known Bugs:</b>
 <ul>
 <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>
 <p><b>Sample:</b></p>
 <p>This sets up a RELP server on port 20514.<br>

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;