| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'c9' | Rainer Gerhards | 2013-10-11 | 1 | -0/+10 |
| |\ | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c | ||||
| | * | imptcp: add "defaultTZ" input parameter | Rainer Gerhards | 2013-10-11 | 1 | -1/+11 |
| | | | |||||
| | * | experimental: make impstats return delta values where possible | Rainer Gerhards | 2013-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c plugins/imptcp/imptcp.c | ||||
| * | | experimental: make impstats return delta values where possible | Rainer Gerhards | 2013-09-07 | 1 | -3/+3 |
| | | | |||||
| * | | cleanup | Rainer Gerhards | 2013-07-15 | 1 | -12/+0 |
| | | | |||||
| * | | Merge branch 'master' into master-zipflush | Rainer Gerhards | 2013-07-15 | 1 | -8/+8 |
| |\ \ | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c | ||||
| | * | | bugfix: stream compression in imptcp caused timestamp to be corrupted | Rainer Gerhards | 2013-07-15 | 1 | -7/+8 |
| | | | | |||||
| * | | | milestone: tcp stream compression support for transaction boundaries | Rainer Gerhards | 2013-07-15 | 1 | -1/+13 |
| |/ / | |||||
| * | | fix compile problem in debug build | Rainer Gerhards | 2013-07-09 | 1 | -2/+0 |
| | | | |||||
| * | | bugfix: imptcp did not properly initialize compression status variable | Rainer Gerhards | 2013-06-26 | 1 | -0/+1 |
| | | | | | | | | | could lead to segfault if stream:always compression mode was selected | ||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 1 | -4/+1 |
| |\| | |||||
| | * | bugfix: RainerScript object required parameters were not properly checked | Rainer Gerhards | 2013-06-24 | 1 | -4/+1 |
| | | | | | | | | | this clould result to segfaults on startup if parameters were missing. | ||||
| * | | tcp strm compression: add stats counters | Rainer Gerhards | 2013-04-18 | 1 | -5/+23 |
| | | | |||||
| * | | tcp strm compression: add config parameters | Rainer Gerhards | 2013-04-18 | 1 | -6/+39 |
| | | | |||||
| * | | tcp strm compression: first PoC | Rainer Gerhards | 2013-04-18 | 1 | -10/+114 |
| |/ | | | | NOT to be used for production, lots of things are missing | ||||
| * | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-28 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c | ||||
| | * | bugfix: supportoctetcountedframing parameter did not work in imptcp | Rainer Gerhards | 2012-11-25 | 1 | -1/+1 |
| | | | |||||
| * | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+11 |
| | | | |||||
| * | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 1 | -1/+2 |
| | | | |||||
| * | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 1 | -4/+2 |
| | | | |||||
| * | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 1 | -1/+2 |
| | | | |||||
| * | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 1 | -1/+0 |
| | | | |||||
| * | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 1 | -12/+7 |
| | | | |||||
| * | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 1 | -3/+3 |
| |/ | | | | no actual implementation yet done | ||||
| * | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 1 | -1/+3 |
| | | |||||
| * | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | |||||
| * | imudp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -0/+2 |
| | | |||||
| * | imptcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -14/+119 |
| | | |||||
| * | bugfix: imptcp aborted when $InputPTCPServerBindRuleset was used | Rainer Gerhards | 2012-07-24 | 1 | -1/+1 |
| | | |||||
| * | bugfix: imtcp aborted when more than 2 connections were used. | Andre Lorbach | 2012-07-11 | 1 | -1/+1 |
| | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342 | ||||
| * | bugfix: small memory leak in imptcp (static after config read) | Rainer Gerhards | 2012-06-14 | 1 | -1/+2 |
| | | |||||
| * | bugfix: invalid free in imptcp could lead to abort during startup | Rainer Gerhards | 2012-05-29 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'v5-devel' | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c | ||||
| | * | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 1 | -2/+13 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | ||||
| | * \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * \ \ | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -1/+3 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| * | \ \ \ | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 1 | -3/+19 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -3/+14 |
| | | |_|/ | |/| | | | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | ||||
| | * | | | added missing initialization of stats counters | Rainer Gerhards | 2012-03-14 | 1 | -0/+1 |
| | | |/ | |/| | | | | | | | | | | | | | | | | 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! | ||||
| | * | | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6 | Rainer Gerhards | 2012-02-20 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge branch 'v6-stable-noscoping' into master | Rainer Gerhards | 2012-01-19 | 1 | -12/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | undoing v6.1 config scoping interface, part I | Rainer Gerhards | 2012-01-18 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | The most common files are now changed, more needs to be done. | ||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-18 | 1 | -17/+16 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c | ||||
| * | \ \ \ | Merge branch 'v5-devel' into master | Rainer Gerhards | 2012-01-18 | 1 | -16/+43 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-18 | 1 | -15/+41 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | imptcp: added additional information to stats record | Rainer Gerhards | 2012-01-18 | 1 | -6/+10 |
| | | | | | | |||||
| | | * | | | imptcp: added basic stats counters | Rainer Gerhards | 2012-01-18 | 1 | -10/+32 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -17/+16 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| * | | | | Merge branch 'v5-stable' into master | Rainer Gerhards | 2012-01-18 | 1 | -17/+17 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | | | | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |