rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2026-04-08 11:17:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-beta' into beta

Browse Source 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf_modules.html
	tests/Makefile.am
	tests/sndrcv_drvr.sh
This commit is contained in:
Rainer Gerhards 2009-11-25 19:13:30 +01:00
commit 1f48ed19f3
7 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -4,6 +4,8 @@ Version 5.3.6 [BETA] (rgerhards), 2009-11-??
end of transaction end of transaction
- bugfix: enabling GSSServer crashes rsyslog startup - bugfix: enabling GSSServer crashes rsyslog startup
Thanks to Tomas Kubina for the patch [imgssapi] Thanks to Tomas Kubina for the patch [imgssapi]
- bugfix (kind of): check if TCP connection is still alive if using TLS
Thanks to Jonathan Bond-Caron for the patch.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 5.3.5 [BETA] (rgerhards), 2009-11-13 Version 5.3.5 [BETA] (rgerhards), 2009-11-13
- some light performance enhancement by replacing time() call with much - some light performance enhancement by replacing time() call with much
@ -288,11 +290,13 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-??
See ticket for details: http://bugzilla.adiscon.com/show_bug.cgi?id=150 See ticket for details: http://bugzilla.adiscon.com/show_bug.cgi?id=150
- imported changes from 4.5.6 and below - imported changes from 4.5.6 and below
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Version 4.5.7 [v4-beta] (rgerhards), 2009-11-?? Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18
- added a so-called "On Demand Debug" mode, in which debug output can - added a so-called "On Demand Debug" mode, in which debug output can
be generated only after the process has started, but not right from be generated only after the process has started, but not right from
the beginning. This is assumed to be useful for hard-to-find bugs. the beginning. This is assumed to be useful for hard-to-find bugs.
Also improved the doc on the debug system. Also improved the doc on the debug system.
- bugfix (kind of): check if TCP connection is still alive if using TLS
Thanks to Jonathan Bond-Caron for the patch.
- bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did - bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did
not work. not work.
--------------------------------------------------------------------------- ---------------------------------------------------------------------------

64
doc/rsyslog_conf_modules.html
View File

@ -2,11 +2,42 @@
<html><head><title>Modules - rsyslog.conf</title></head> <html><head><title>Modules - rsyslog.conf</title></head>
<body> <body>
<p>This is a part of the rsyslog.conf documentation.</p> <p>This is a part of the rsyslog.conf documentation.</p>
<a href="rsyslog_conf.html">back</a> <a href="rsyslog_conf.html">Back to rsyslog.conf manual</a>
<h2>Modules</h2> <h1>Modules</h1>
<p>Rsyslog has a modular design. Consequently, there is a growing <p>Rsyslog has a modular design. This enables functionality to be
dynamically loaded from modules, which may also be written by any
third party. Rsyslog itself offers all non-core functionality as
modules. Consequently, there is a growing
number of modules. Here is the entry point to their documentation and number of modules. Here is the entry point to their documentation and
what they do (list is currently not complete)</p> what they do (list is currently not complete)</p>
<p>Please note that each module provides configuration
directives, which are NOT necessarily being listed below. Also
remember, that a modules configuration directive (and functionality) is
only available if it has been loaded (using $ModLoad).</p>
<p>It is relatively easy to write a rsyslog module. <b>If none of the provided
modules solve your need, you may consider writing one or have one written
for you by
<a href="http://www.rsyslog.com/professional-services">Adiscon's professional services for rsyslog</a>
</b>(this often is a very cost-effective and efficient way of getting what you need).
<h2>Input Modules</h2>
<p>Input modules are used to gather messages from various sources. They interface
to message generators.
<ul>
<li><a href="imfile.html">imfile</a> -&nbsp; input module for text files</li>
<li><a href="imrelp.html">imrelp</a> - RELP input module</li>
<li>imudp - udp syslog message input</li>
<li><a href="imtcp.html">imtcp</a> - input plugin for plain tcp syslog</li>
<li><a href="imgssapi.html">imgssapi</a> - input plugin for plain tcp and GSS-enabled syslog</li>
<li>immark - support for mark messages</li>
<li><a href="imklog.html">imklog</a> - kernel logging</li>
<li><a href="imuxsock.html">imuxsock</a> - unix sockets, including the system log socket</li>
<li><a href="im3195.html">im3195</a> - accepts syslog messages via RFC 3195</li>
</ul>
<h2>Output Modules</h2>
<p>Output modules process messages. With them, message formats can be transformed
and messages be transmitted to various different targets.
<ul> <ul>
<li><a href="omsnmp.html">omsnmp</a> - SNMP trap output module</li> <li><a href="omsnmp.html">omsnmp</a> - SNMP trap output module</li>
<li><a href="omstdout.html">omtdout</a> - stdout output module (mainly a test tool)</li> <li><a href="omstdout.html">omtdout</a> - stdout output module (mainly a test tool)</li>
@ -21,27 +52,14 @@ SQLLite, Ingres, Oracle, mSQL)</li>
<li><a href="ommail.html">ommail</a> - <li><a href="ommail.html">ommail</a> -
permits rsyslog to alert folks by mail if something important happens</li> permits rsyslog to alert folks by mail if something important happens</li>
<li><a href="omoracle.html">omoracle</a> - output module for Oracle (native OCI interface)</li> <li><a href="omoracle.html">omoracle</a> - output module for Oracle (native OCI interface)</li>
<li><a href="omudpspoof.html">omudpspoof</a> - output module sending UDP syslog messages with a spoofed address</li>
<li><a href="imfile.html">imfile</a>
-&nbsp; input module for text files</li>
<li><a href="imrelp.html">imrelp</a> - RELP
input module</li>
<li><a href="imudp.html">imudp</a> - udp syslog message input</li>
<li><a href="imtcp.html">imtcp</a> - input
plugin for plain tcp syslog</li>
<li><a href="imgssapi.html">imgssapi</a> -
input plugin for plain tcp and GSS-enabled syslog</li>
<li>immark - support for mark messages</li>
<li><a href="imklog.html">imklog</a> - kernel logging</li>
<li><a href="imuxsock.html">imuxsock</a> -
unix sockets, including the system log socket</li>
<li><a href="im3195.html">im3195</a> -
accepts syslog messages via RFC 3195</li>
</ul> </ul>
<p>Please note that each module provides configuration
directives, which are NOT necessarily being listed below. Also <h2>Library Modules</h2>
remember, that a modules configuration directive (and functionality) is <p>Library modules provide dynamically loadable functionality for parts of rsyslog,
only available if it has been loaded (using $ModLoad).</p> most often for other loadable modules. They can not be user-configured and are loaded
automatically by some components. They are just mentioned so that error messages that
point to library moduls can be understood. No module list is provided.
<p>[<a href="manual.html">manual index</a>] <p>[<a href="manual.html">manual index</a>]
[<a href="rsyslog_conf.html">rsyslog.conf</a>] [<a href="rsyslog_conf.html">rsyslog.conf</a>]
[<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>

3
runtime/net.c
View File

@ -1568,6 +1568,9 @@ CODESTARTobjQueryInterface(net)
pIf->DestructPermittedPeers = DestructPermittedPeers; pIf->DestructPermittedPeers = DestructPermittedPeers;
pIf->PermittedPeerWildcardMatch = PermittedPeerWildcardMatch; pIf->PermittedPeerWildcardMatch = PermittedPeerWildcardMatch;
pIf->CmpHost = CmpHost; pIf->CmpHost = CmpHost;
/* data members */
pIf->pACLAddHostnameOnFail = &ACLAddHostnameOnFail;
pIf->pACLDontResolve = &ACLDontResolve;
finalize_it: finalize_it:
ENDobjQueryInterface(net) ENDobjQueryInterface(net)

4
runtime/net.h
View File

@ -149,8 +149,8 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */
/* v5 interface additions */ /* v5 interface additions */
int (*CmpHost)(struct sockaddr_storage *, struct sockaddr_storage*, size_t); int (*CmpHost)(struct sockaddr_storage *, struct sockaddr_storage*, size_t);
/* data members - these should go away over time... TODO */ /* data members - these should go away over time... TODO */
int pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */ int *pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */
int pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */ int *pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */
ENDinterface(net) ENDinterface(net)
#define netCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ #define netCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */

5
runtime/nsd_gtls.c
View File

@ -1327,7 +1327,10 @@ finalize_it:
static void static void
CheckConnection(nsd_t __attribute__((unused)) *pNsd) CheckConnection(nsd_t __attribute__((unused)) *pNsd)
{ {
/* dummy, do nothing */ nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd;
ISOBJ_TYPE_assert(pThis, nsd_gtls);
nsd_ptcp.CheckConnection(pThis->pTcp);
} }

2
tests/sndrcv_drvr.sh
View File

@ -35,7 +35,7 @@ source $srcdir/diag.sh wait-startup 2
# now inject the messages into instance 2. It will connect to instance 1, # now inject the messages into instance 2. It will connect to instance 1,
# and that instance will record the data. # and that instance will record the data.
source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 $2 1 source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 $2 1
sleep 2 # ensure all messages reach the input module sleep 2 # make sure all data is received in input buffers
# shut down sender when everything is sent, receiver continues to run concurrently # shut down sender when everything is sent, receiver continues to run concurrently
# may be needed by TLS (once we do it): sleep 60 # may be needed by TLS (once we do it): sleep 60
source $srcdir/diag.sh shutdown-when-empty 2 source $srcdir/diag.sh shutdown-when-empty 2

4
tools/syslogd.c
View File

@ -2649,10 +2649,10 @@ int realMain(int argc, char **argv)
fprintf(stderr, "error -p is no longer supported, use module imuxsock instead"); fprintf(stderr, "error -p is no longer supported, use module imuxsock instead");
} }
case 'q': /* add hostname if DNS resolving has failed */ case 'q': /* add hostname if DNS resolving has failed */
net.pACLAddHostnameOnFail = 1; *(net.pACLAddHostnameOnFail) = 1;
break; break;
case 'Q': /* dont resolve hostnames in ACL to IPs */ case 'Q': /* dont resolve hostnames in ACL to IPs */
net.pACLDontResolve = 1; *(net.pACLDontResolve) = 1;
break; break;
case 'r': /* accept remote messages */ case 'r': /* accept remote messages */
if(iCompatibilityMode < 3) { if(iCompatibilityMode < 3) {