rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 11:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,908 Commits 67 Branches 505 Tags
Commit Graph

147 Commits

Author SHA1 Message Date
Rainer Gerhards
a3e7ebc766 Merge branch 'v7-stable' into v7-devel 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
 2013-12-10 09:54:27 +01:00
Tomas Heinrich
f1aa114c26 bugfix: prevent a memleak in imtcp 
This cleans up a memleak triggered by the previous commit
 2013-12-10 09:50:39 +01:00
Tomas Heinrich
d5dead4ea0 bugfix: prevent a segfault during imtcp's shutdown 
If imtcp is loaded and no listeners are configured (which is uncommon),
rsyslog crashes during shutdown.

The cause is that startWorkerPool() is called unconditionally during
modExit() even if there are no listerners. Correcting this triggers a
memleak of the wrkrMut mutex which shouldn't have been destroyed in
startWorkerPool() in the first place.
 2013-12-10 09:48:53 +01:00
Rainer Gerhards
33bb5517ba imtcp: add streamdriver.name module parameter 
permits overriding the system default stream driver (gtls, ptcp)
 2013-09-17 15:01:30 +02:00
Rainer Gerhards
c8ba2749b6 Merge branch 'v7-stable' 
Conflicts:
	runtime/rsyslog.h
 2013-09-13 12:09:54 +02:00
Rainer Gerhards
7903677bfb Merge branch 'v7-stable' into v7-stable-tlsfix 
Conflicts:
	ChangeLog
	runtime/rsyslog.h
 2013-09-13 02:39:42 +02:00
Rainer Gerhards
ad77733062 bugfix: segfault on startup if TLS was used but no CA cert set 2013-09-13 02:37:06 +02:00
Rainer Gerhards
fbc737d650 experimental: make impstats return delta values where possible 2013-09-07 15:58:09 +02:00
Rainer Gerhards
d11e8221a8 milestone: defaultTZ can be set in msg obj (via imtcp) 
... but parser does not yet use it.
 2013-08-30 18:29:46 +02:00
Rainer Gerhards
0d71694fb3 optimize: have dns cache pre-create rsyslog prop_t's 2013-01-24 06:19:13 +01:00
Rainer Gerhards
0dc56f1426 imtcp: support for Linux-Type ratelimiting added 2012-10-15 19:01:05 +02:00
Rainer Gerhards
34a88a7e9a ratelimit: added linux-like ratelimiter type 2012-10-15 16:39:36 +02:00
Rainer Gerhards
0d60901e6e ratelimit: imtcp (and gssapi) converted to new interface 2012-10-15 12:09:37 +02: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
cf100be58c Merge branch 'beta' 
Conflicts:
	ChangeLog
	configure.ac
 2012-07-24 12:48:39 +02:00
Andre Lorbach
afe402d241 bugfix: imtcp aborted when more than 2 connections were used. 
Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
 2012-07-11 03:08:32 -07:00
Rainer Gerhards
bf85d81790 implemented freeCnf() module interface & fixed some mem leaks 
The interface was actually not present in older versions, even though some modules
already used it. The implementation was now done, and not in 6.3/6.4
because the resulting memory leak was ultra-slim and the new interface
handling has some potential to seriously break things. Not the kind of
 thing you want to add in late beta state, if avoidable.
 2012-06-25 12:35:46 +02:00
Rainer Gerhards
439a5b70f2 improved support for --enable-debugless 
Now it's probably time to prove the effect in practice...
 2012-05-29 12:42:46 +02:00
Rainer Gerhards
261fe8e6cd tcpsrv: cleaned up patch, works now with multiple users as well 
Note: "users" means modules, like imtcp and imdiag. NOT real users
or devices.
 2012-05-18 08:59:08 +02:00
Rainer Gerhards
fa0a859d21 regression: tcpsrv.c always activated first worker, what lead to hang 
... if more than 3 fds were to be read at the same time.
 2012-05-16 18:30:40 +02:00
Rainer Gerhards
03e9a91731 bugfix: imtcp could cause hang during reception 
this also applied to other users of core file tcpsrv.c, but imtcp was
by far the most prominent and widely-used, the rest rather exotic
(like imdiag)

NOTE: this patch is probably not 100% correct and may cause problems
if multiple tcpsrv.c users existing within a configuration. The next
step is to evaluate this and probably slightly change the worker thread
startup/shutdown location.
 2012-05-16 16:39:27 +02:00
Rainer Gerhards
29897b90ce minor issue: tcpsrv did not decrement wrkr cnt on shutdown 
I am not really sure if that is an issue at all, at least it
is inconsistent.
 2012-05-15 14:30:36 +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
2ee2cff538 Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	ChangeLog
	plugins/imtcp/imtcp.c
	tcpsrv.h
 2012-03-19 18:10:20 +01: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
1d0dec9b0c Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	configure.ac
 2012-03-14 13:53:25 +01:00
Rainer Gerhards
7d516b0a6c added missing initialization of stats counters 
this was necessary due to refactoring of the stats subsystem ... but
should have been done in the first place when this code was written.
Thanks to Kaiwang Chen for his analysis of the stats subsystem, which
ultimately lead to this patch!
 2012-03-14 13:51:18 +01:00
Rainer Gerhards
ac9afc4149 Merge branch 'v5-stable' into master 
Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c
 2012-01-18 14:08:24 +01:00
Rainer Gerhards
abb381b8a5 Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	plugins/imtcp/imtcp.c
 2012-01-16 17:04:10 +01:00
Rainer Gerhards
29807bb3c9 Merge branch 'v5-stable' into v5-stable-newstats 
Conflicts:
	plugins/impstats/impstats.c
 2012-01-16 16:25:45 +01:00
Rainer Gerhards
0871d0a077 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c
 2012-01-14 18:32:40 +01:00
Rainer Gerhards
0862e839b6 some more files to ASL 2.0 2012-01-11 18:49:00 +01:00
Rainer Gerhards
409cd9496b Merge branch 'v5-devel' 2011-12-20 18:35:37 +01:00
Rainer Gerhards
22b7ecfe76 Merge branch 'v5-stable-newstats' into v5-devel 
Conflicts:
	plugins/imuxsock/imuxsock.c
 2011-12-20 18:35:20 +01:00
Rainer Gerhards
832d6e1e2c imtcp: added stats counters 
also adds counters to other users of tcpsrv.c method, but these do not
work if default submit method is overwritten (currently only the case
for imdiag, what we don't consider a problem)
 2011-12-20 18:19:14 +01:00
Rainer Gerhards
8488d8c3c1 Merge branch 'v5-devel' 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	tools/omfile.c
 2011-06-27 12:33:26 +02:00
Rainer Gerhards
c561994c10 Merge branch 'v5-stable' into v5-devel 
Conflicts:
	ChangeLog
	tcpsrv.c
 2011-06-14 14:24:59 +02:00
Rainer Gerhards
f4c5f0a4cc Merge branch 'v4-devel' into v5-devel 
Conflicts:
	tcpsrv.c
 2011-06-14 14:22:37 +02:00
Rainer Gerhards
bcd956d4d5 bugfix: memory leak in imtcp & subsystems under some circumstances 
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures. [backport from v6, limited testing under v4]
 2011-06-14 12:52:02 +02:00
Rainer Gerhards
2c81df12bc bugfix: memory leak in imtcp & subsystems under some circumstances 
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures.

Note: this is a backport from v6. In v5, we currently do not have
the toolchain to verify the original problem and that it is solved.
So this patch is preliminary and subject to change as work progresses.
 2011-06-10 22:50:25 +02:00
Rainer Gerhards
e1d21ca141 bugfix: memory leak in imtcp & subsystems under some circumstances 
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures.
 2011-06-10 22:43:00 +02:00
Rainer Gerhards
6625a8790d added capability for imtcp to activate keep-alive packets 
at the socket layer.
reference: http://kb.monitorware.com/post20791.html
 2011-05-09 10:07:23 +02:00
Rainer Gerhards
759904862d step: imtcp did not properly handle privilege drop 2011-05-06 10:30:10 +02:00
Rainer Gerhards
9430aa0d3a Merge branch 'v5-stable' into v5-devel 2011-05-03 12:29:03 +02:00
Rainer Gerhards
25045234c2 Merge branch 'v5-stable' 2011-05-02 14:53:15 +02:00
Rainer Gerhards
466e026401 Merge branch 'v4-stable' into v5-stable 
Conflicts:
	tcpsrv.c
 2011-05-02 12:59:54 +02:00
Rainer Gerhards
921bebc8ee bugfix: TCP connection invalidly aborted when messages needed to be discarded 
due to QUEUE_FULL or similar problem
 2011-05-02 12:43:58 +02:00
Rainer Gerhards
4b600b08a1 cosmetic cleanup 2011-05-02 12:31:02 +02:00