62 Commits

Author SHA1 Message Date
Pascal Withopf
b63a6b9010 codestyle: line length adjusted 2017-01-17 08:54:37 +01:00
Peter Portante
2470f0f72b Remove use of sizeof(char) and sizeof(uchar)
Remove the use sizeof(char) or sizeof(uchar) in calculations for memory
allocation or string length.  There are no known platforms for which
sizeof(char) or sizeof(uchar) is not 1, and c99 has defined sizeof(char)
to be 1 (section 6.5.3.4 of c99).
2015-12-16 02:18:45 +00:00
root
4bc2af4ebd fixed issues with imdiag and imgssapi plugins 2015-03-25 12:35:55 +01:00
Rainer Gerhards
423c3ac62c pstats: add "origin" paramter to stats records
see also: https://github.com/rsyslog/rsyslog/issues/119
2014-11-19 15:49:09 +01:00
bodik
d17fdbc923 imgssapi: add keepalive option 2014-09-03 11:13:23 +02:00
bodik
7d0676e739 imgssapi: log remote peer ip in some error messages 2014-09-01 12:47:08 +02:00
Tomas Heinrich
0062d8e2b7 bugfix: postpone the start of the imgssapi listener
If the listen socket is opened earlier (during configuration parsing),
it is closed again during early init.

The start has been postponed to the 'runInput' stage, which has an
unpleasant side effect that it will fail if the priviledges are
dropped.

The code should be eventually fixed to support the new config system.
2013-06-03 18:18:45 +02:00
Rainer Gerhards
d6da57ae03 Merge branch 'v5-stable-newstats'
Conflicts:
	action.c
	configure.ac
	doc/imuxsock.html
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c
	runtime/ruleset.c
	tcpsrv.h
	tools/syslogd.c
2012-04-07 15:42:46 +02:00
Rainer Gerhards
4fb7ba113c added configuration directive to disable octet-counted framing
... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
2012-03-19 15:28:25 +01:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/immark/immark.c
	plugins/imptcp/imptcp.c
	plugins/imrelp/imrelp.c
	plugins/imtcp/imtcp.c
	plugins/imtemplate/imtemplate.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	plugins/omtemplate/omtemplate.c
	runtime/glbl.c
	runtime/parser.c
	tools/omfile.c
	tools/syslogd.c
2012-01-19 13:07:46 +01:00
Rainer Gerhards
b38dd53e08 undoing v6.1 config scoping interface, part II (now finished)
This concludes the removal of the new scoping interface, at least as
far as pre v6-plugins are affected. Full code cleanup will happen
in the v6.3 branch.
2012-01-19 12:33:12 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
b056c258d7 step: generalized new config interface for all module types 2011-05-06 08:43:15 +02:00
Rainer Gerhards
c0d1334f6e step: imtcp moved to new config interface
as far as we know that new interface right now ;)
2011-05-05 11:36:05 +02:00
Rainer Gerhards
d0d9f823b7 step: put plumbing in place for new input module config system 2011-05-03 18:02:18 +02:00
Rainer Gerhards
6c3ef4dacf Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh
2011-03-11 10:24:58 +01:00
Bojan Smojver
d1eb6e0edc added work-around for bug in gtls, which causes fd leak when using TLS
The capability has been added for module to specify that they do not
like being unloaded.
related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-02-23 11:25:43 +01:00
Rainer Gerhards
e64cd21243 moving towards scoping inside rsyslog.conf
first step: adding object-type specifier to config statement table
2010-07-21 18:08:19 +02:00
Rainer Gerhards
c21d381030 Merge branch 'beta'
Conflicts:
	ChangeLog
2009-11-25 14:53:20 +01:00
Rainer Gerhards
3313c4d668 Merge branch 'v5-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am
2009-11-25 14:52:18 +01:00
Tomas Kubina
52a0120a38 bugfix: enabling GSSServer crashes rsyslog startup 2009-11-25 14:47:39 +01:00
Rainer Gerhards
604d782f09 minor: moved all code to new isAllowedSender2() interface 2009-11-17 10:43:36 +01:00
Rainer Gerhards
0957820a10 Merge branch 'v4-devel'
Conflicts:
	doc/rsyslog_conf_modules.html
	gss-misc.c
	plugins/imgssapi/imgssapi.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c
2009-11-17 10:38:46 +01:00
varmojfekoj
30c2e42ec3 added option to use unlimited-size select() calls
Thanks to varmjofekoj for the patch

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-11-17 09:00:01 +01:00
Rainer Gerhards
e04e1b5002 enhanced test environment (including testbench)
support for enhancing probability of memory addressing failure by
using non-NULL default value for malloced memory (optional, only if
requested by configure option). This helps to track down some
otherwise undetected issues within the testbench and is expected
to be very useful in the future.
2009-10-22 11:33:38 +02:00
Rainer Gerhards
7d92de155c internal: added ability to terminate input modules not via pthread_cancel...
... but an alternate approach via pthread_kill. This is somewhat safer as we
do not need to think about the cancel-safeness of all libraries we use.
However, not all inputs can easily supported, so this now is a feature
that can be requested by the input module (the most important ones
request it).
2009-07-20 18:36:30 +02:00
Rainer Gerhards
aba90e8248 added capability to run multiple tcp listeners (on different ports)
Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
2009-05-22 17:06:52 +02:00
Rainer Gerhards
889a0a1da8 some cleanup
... mostly removal of compile-time warnings (thanks to Michael
Biebl for suggesting to look after that)
2009-04-17 15:19:57 +02:00
Rainer Gerhards
ae7a01e137 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-03-11 15:15:34 +01:00
varmojfekoj
5d4fd0e2ef fixed a potential segfault problem in gssapi code
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-03-02 15:24:36 +01:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase
pkg-config uses uppercase for its _CFLAGS and _LIBS variable names.
So we follow suit and convert all _cflags and _libs variables to
uppercase for more consistency.
2009-02-24 13:09:44 +01:00
Rainer Gerhards
fae8f451ab Merge branch 'v3-stable' into beta
Conflicts:
	runtime/rsyslog.h
2008-11-29 08:02:37 +01:00
Rainer Gerhards
4879952995 minor cleanup 2008-11-29 07:48:24 +01:00
Rainer Gerhards
f0ddbed44c security bugfix: $AllowedSender was not honored,
...all senders were permitted instead
2008-11-29 07:22:48 +01:00
Rainer Gerhards
1a9ac0ced7 removed compile time fixed message size limit (was 2K)
The limit can now be set via $MaxMessageSize global config
directive (finally gotten rid of MAXLINE ;))
2008-09-02 11:38:31 +02:00
Rainer Gerhards
3f6c73a8b7 added (internal) error codes to error messages
Also added redirector to web description of error codes
closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
2008-06-27 12:52:45 +02:00
Rainer Gerhards
7b1a570d54 changed Rcv-Interface in tcpsrv subsystem
It is now iRet based. This enables us to communicate
more in-depth information to the upper peers. This is needed
to handle the EGAIN case on rcv (not yet implemented)
2008-06-23 10:29:15 +02:00
Michael Biebl
b6b53972e1 Remove .cvsignore files, add .gitignore.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-06-11 17:03:47 +02:00
Rainer Gerhards
b9cbb0d696 made imgssapi work with new netstrm driver model
there were a couple of things where imgssapi was not compatible
with the new encapsulation. I did a somewhat dirty fix. The real
solution would be to turn gssapi functionality into a netstream
driver, which is too much for now (after all, we want to release
some time AND we need to have the code mature in practice
before we go for the next target...).
2008-05-05 11:45:41 +02:00
Rainer Gerhards
d9b0c77d3e some more cleanup
reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear
2008-04-16 15:27:53 +02:00
Rainer Gerhards
d7f33053da made everything compile with the new runtime subdirectory 2008-04-16 08:42:00 +02:00
Rainer Gerhards
b0e8ce6c3d bugfix: TCP (and GSSAPI) octet-counted frame did not work correctly in all
situations. If the header was split across two packet reads, it was
    invalidly processed, causing loss or modification of messages.
2008-03-14 17:03:14 +00:00
Rainer Gerhards
17f36a76cb bugfix: imgssapi segfaulted under some conditions; this fix is actually not
just a fix but a change in the object model. Thanks to varmojfekoj for
    providing the bug report, an initial fix and lots of good discussion
    that lead to where we finally ended up.
2008-03-13 11:04:33 +00:00
Rainer Gerhards
e946e122d0 implemented module unload handling (required a number of interface changes) 2008-03-11 16:43:13 +00:00
Rainer Gerhards
4db62823e7 renamed library module file names to lm*, so that they match the overall
scheme (like im* and om*)
2008-03-07 17:26:58 +00:00
Rainer Gerhards
fa67273c16 - added RSYSLOGD_MODDIR environment variable
- added -M rsyslogd option (allows to specify module directory location)
- converted net.c into a loadable library plugin
2008-03-07 08:06:16 +00:00
Rainer Gerhards
96ff31f5bf applied some bugfixes to new code supplied by varmojfekoj - thanks! 2008-03-06 14:13:43 +00:00
Rainer Gerhards
28dcc746bd applied patch from Michael Biebl to clean up build system 2008-03-06 07:39:32 +00:00
Rainer Gerhards
f9105d5141 changed module loader to automatically add ".so" suffix if not specified
(over time, this shall also ease portability of config files)
2008-03-05 16:55:13 +00:00
Rainer Gerhards
3dd5242adf some more cleanup 2008-03-05 16:10:17 +00:00