92 Commits

Author SHA1 Message Date
Rainer Gerhards
409fe2b073 bugfix: omfwd parameter streamdrivermmode was not properly handled
it was always overwritten by whatever value was set via the
legacy directive $ActionSendStreamDriverMode
2013-09-17 15:52:46 +02:00
Rainer Gerhards
199f01614c cleanup 2013-07-15 17:47:04 +02:00
Rainer Gerhards
04e1f5d330 milestone: tcp stream compression support for transaction boundaries 2013-07-15 16:04:44 +02:00
Rainer Gerhards
dc472ce76b Merge branch 'c8'
Conflicts:
	ChangeLog
	doc/imudp.html
	plugins/imudp/imudp.c
2013-07-11 10:12:52 +02:00
Rainer Gerhards
38aa077ccb imudp: add ability to specify SO_RCVBUF size (rcvbufSize parameter) 2013-07-11 10:01:57 +02:00
Rainer Gerhards
e3da34ca5c tcp strm compression: add config parameters 2013-04-18 11:35:23 +02:00
Rainer Gerhards
7a7a9fda67 tcp strm compression: first PoC
NOT to be used for production, lots of things are missing
2013-04-18 08:05:53 +02:00
Rainer Gerhards
ad1b93df8a bugfix: omfwd did not properly support "template" parameter
We also added a testbench test to check for this in the future. That
in turn required new testbench tools.
2012-10-30 13:06:20 +01:00
Rainer Gerhards
74b81c8c01 Merge branch 'v6-stable' into v6-devel 2012-09-06 12:00:05 +02:00
88faed212c Fixed TCP CheckConnection handling in omfwd.c.
Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
2012-08-25 12:08:08 -07:00
Rainer Gerhards
de71589ca3 Merge branch 'v6-stable'
Conflicts:
	ChangeLog
	configure.ac
	runtime/ruleset.c
	tools/syslogd.c
2012-08-25 12:19:56 +02:00
Rainer Gerhards
8939ccfffd Merge branch 'v5-stable' into v6-stable
Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c
2012-08-25 11:55:41 +02:00
Rainer Gerhards
9faf2240c4 changed TRUE/FALSE to RSTRUE/RSFALSE
This is done to prevent name claches with libraries.
2012-08-22 15:29:02 +02:00
Rainer Gerhards
87002e246d omfwd: support for module() global config parameters added 2012-06-25 17:41:12 +02:00
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +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
9b24152b6a undoing v6.1 config scoping interface, part I
The most common files are now changed, more needs to be done.
2012-01-18 18:21:08 +01:00
Rainer Gerhards
03be2fcd7c Merge branch 'v5-devel' into master
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
	plugins/imptcp/imptcp.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/parser.c
	template.c
	tools/omfwd.c
	tools/syslogd.c
2012-01-18 14:51:33 +01:00
Rainer Gerhards
d5a18a93ae omfwd refactor: even more simplification (small one ;)) 2012-01-14 18:29:33 +01:00
Rainer Gerhards
38afe62f33 omfwd license change to ASL 2.0
after careful consideration of contributor history. David Lang gave
permission to license under ASL 2.0, other patches have been replaced
by refactored code.
2012-01-14 18:25:23 +01:00
Rainer Gerhards
ac64c118ea omfwd refactor: simplification
at the same time, remove commits
- 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127
- 009738a0ac6ba0dccf403f9e396095f44e4f9ac6
2012-01-14 18:22:16 +01:00
Rainer Gerhards
45ba66d14a omfwd refactor: simplifying code
also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa
2012-01-14 18:13:26 +01:00
Rainer Gerhards
26a668f8fa added support for v6 config system to omfwd 2011-10-11 12:26:48 +02:00
Rainer Gerhards
fd4a54698c Merge branch 'v5-stable' into beta
Conflicts:
	tools/omfwd.c
2011-05-09 15:07:22 +02:00
Rainer Gerhards
b1fe03c82f Merge branch 'v4-devel' into v5-devel
Conflicts:
	ChangeLog
	runtime/parser.c
	tests/Makefile.am
2011-05-09 15:02:02 +02:00
Rainer Gerhards
87a01476e2 Merge branch 'v4-stable' into v5-stable 2011-05-09 14:39:54 +02:00
Rainer Gerhards
831ce25230 bugfix: invalid storage type for config variables 2011-05-09 12:29:07 +02:00
Tomas Heinrich
816ab51f4b bugfix: stream driver mode was not correctly set on tcp ouput on big endian systems.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-05-09 12:24:14 +02:00
Rainer Gerhards
2d65e3d5bd omfwd: made send function handling incomplete sends correctly 2011-04-04 11:58:07 +02:00
Rainer Gerhards
d4cc262156 added one more testcase for sending TCP/TLS syslog 2011-04-04 11:50:43 +02:00
Rainer Gerhards
8653db6996 omfwd: speeded up tcp forwarding by reducing number of API calls 2011-04-04 11:16:15 +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
bcc3b2aef7 Merge branch 'v5-devel'
Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c
2010-12-17 13:20:55 +01:00
Rainer Gerhards
189a26c044 Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	runtime/parser.c
	runtime/queue.c
	runtime/wtp.c
	template.c
	threads.c
	tools/syslogd.c
2010-12-16 13:59:16 +01:00
Rainer Gerhards
371a8eec29 some cleanup based on clang static analyzer results 2010-12-16 12:57:55 +01:00
Rainer Gerhards
d460c1cd5d fixed regression from last commit
config variables were not properly initialized
2010-07-27 11:38:25 +02:00
Rainer Gerhards
d18b238f16 milestone commit: output plugin interface changes (may NOT run)
The output interface has been changed, but we do not yet utilize the
new interface. Also, it looks like a regression was introduced. But before
hunting it down, I'd like to make a commit (what also easys the regresion
hunt).
2010-07-27 09:44:35 +02: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
8b9cef552d Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/debug.c
	runtime/stream.c
	tests/Makefile.am
	tests/diskqueue.sh
	tests/nettester.c
	tools/omfile.c
2010-03-29 11:07:15 +02:00
Rainer Gerhards
219336ec5a bugfix: recent patch to fix small memory leak could cause invalid free.
This could only happen during config file parsing.
2010-03-16 17:02:49 +01:00
Rainer Gerhards
d71e8672c9 Merge branch 'v4-beta' into beta 2010-02-04 16:51:43 +01:00
Rainer Gerhards
ef193bf0ae Merge branch 'v4-stable' into v4-beta 2010-02-04 16:43:21 +01:00
varmojfekoj
8c3ab2e26f bugfix: several smaller bugs resolved after flexelint review
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-02-04 16:02:57 +01:00
Rainer Gerhards
d727748481 Merge branch 'v4-beta' into beta 2010-01-12 13:33:51 +01:00
Naoya Nakazawa
009738a0ac fixed a memory leak when sending messages in zip-compressed format
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2010-01-11 12:34:46 +01:00
Rainer Gerhards
6f511cecfa more cleanup and working towards a parser module calling interface
I cleaned up a lot of config variable access along the way. This
version compiles and runs, but does not yet offer any enhanced
functionality. pmrfc5424 is just a dummy that is not yet being used.
2009-11-03 12:39:48 +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
7aa30acc74 bugfix (backport): omfwd segfault
Note that the orginal (higher version) patch states this happens only
when debugging mode is turned on. That statement is wrong: if debug
mode is turned off, the message is not being emitted, but the division
by zero in the actual parameters still happens.
2009-08-27 12:10:44 +02:00
Rainer Gerhards
bd7542b515 Merge branch 'v4.3.2' (v4-beta) into v4-stable
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am
2009-08-21 10:19:56 +02:00