summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2013-03-201-1/+1
|\
| * bugfix: $mmnormalizeuseramsg paramter was specified with wrong typeRainer Gerhards2013-03-201-1/+1
| | | | | | | | | | Thanks to Renzhong Zhang for alerting us of the problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420
* | Merge branch 'v7-stable'Rainer Gerhards2013-03-181-3/+7
|\| | | | | | | | | | | Conflicts: runtime/debug.h tools/syslogd.c
| * Do not exit when messages get overwritten in the circular bufferMilan Bartos2013-03-181-0/+4
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * Fix message read buffer sizeMilan Bartos2013-03-181-2/+2
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * Remove unnecessary strlen() callMilan Bartos2013-03-181-1/+1
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * Fix trailing '-' in kernel messages.Milan Bartos2013-03-181-0/+4
| | | | | | | | modified: plugins/imkmsg/kmsg.c
| * bugfix: imuxsock was missing SysSock.ParseTrusted module parameterRainer Gerhards2013-03-151-0/+3
| | | | | | | | | | | | To use that functionality, legacy rsyslog.conf syntax had to be used. Also, the doc was missing information on the "ParseTrusted" set of config directives.
* | Fix trailing '-' in kernel messages.Milan Bartos2013-03-181-0/+4
| | | | | | | | modified: plugins/imkmsg/kmsg.c
* | bugfix: mmanon did not build on some platforms (e.g. Ubuntu)Rainer Gerhards2013-03-181-0/+1
| |
* | imrelp: now supports listening to IPv4/v6 only instead of always bothRainer Gerhards2013-03-151-0/+1
| | | | | | | | | | build now requires librelp 1.0.2 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=378
* | bugfix: imuxsock was missing SysSock.ParseTrusted module parameterRainer Gerhards2013-03-121-0/+3
| | | | | | | | | | | | use that functionality, legacy rsyslog.conf syntax had to be used. Also, the doc was missing information on the "ParseTrusted" set of config directives.
* | mmanon: complete ipv4 functionalityRainer Gerhards2013-03-041-30/+105
| |
* | mmanon: add ability to specify number of bits to be anonymizedRainer Gerhards2013-03-041-19/+75
| |
* | mmanon: add capability to configure replacement characterRainer Gerhards2013-03-031-9/+45
| |
* | add initial version of mmanon (anonymoization support)Rainer Gerhards2013-02-282-0/+241
| |
* | omjournal: add more syslog fields in journal callRainer Gerhards2013-02-271-0/+5
| |
* | bugfix: imuxsock segfault when system log socket was usedRainer Gerhards2013-02-271-4/+10
| |
* | imuxsock: made config settings for IgnoreOwnMsgs actually working ;)Rainer Gerhards2013-02-261-5/+9
| |
* | imuxsock: add capability to ignore messages from ourselfesRainer Gerhards2013-02-262-1/+20
| | | | | | | | | | This helps prevent message routing loops, and is vital to have if omjournal is used together with traditional syslog.
* | add support for writing to the Linux Journal (omjournal)Rainer Gerhards2013-02-262-0/+185
| |
* | bugfix: mmjsonparse segfault if new-style config was usedRainer Gerhards2013-01-301-11/+11
| |
* | bugfix: imklog issued wrong facility in error messagesRainer Gerhards2013-01-151-1/+1
| | | | | | | | ...what could lead to problems in other parts of the code
* | Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2013-01-141-1/+1
|\ \ | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v7-stable' into v7-stable-libnet-fragRainer Gerhards2013-01-141-1/+1
| |\|
| | * bugfix: omelasticsearch failed when authentication data was providedRainer Gerhards2013-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | ... at least in most cases it emitted an error message: "snprintf failed when trying to build auth string" Thanks to Joerg Heinemann for alerting us. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404
* | | fix compile problem in imklogRainer Gerhards2013-01-131-1/+1
| | |
* | | Correct call to submitMsg()Martin Carpenter2013-01-131-1/+1
| | |
* | | Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2013-01-112-6/+70
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac tools/omfile.c
| * | impstats: added ability to write stats records to local fileRainer Gerhards2013-01-101-5/+69
| | | | | | | | | | | | | | | ...and avoid going through the syslog log stream. syslog logging can now also be turned off (see doc for details).
| * | Merge branch 'v7-stable' into v7-stable-libnet-fragRainer Gerhards2013-01-092-1/+16
| |\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | imudp: make debug message clearerRainer Gerhards2012-12-191-1/+1
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-01-081-0/+1
|\ \ \ | | |/ | |/|
| * | im3195: object was not freed on exit [ASL2.0]Martin Körper2013-01-081-0/+1
| | | | | | | | | | | | | | | This and the other patch from Martin (this morning) was released under ASL 2.0 by him.
* | | Merge branch 'v7-stable'Rainer Gerhards2013-01-082-1/+15
|\| |
| * | bugfix: mmjsonparse errornously returned action error when no CEE cookie was ↵Rainer Gerhards2013-01-081-0/+1
| | | | | | | | | | | | present.
| * | bugfix: compile errors in im3195Martin Körper2013-01-081-1/+14
| | |
* | | Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2012-12-181-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: runtime/rsyslog.h
| * | cosmetic: re-use existing error code instead of new oneRainer Gerhards2012-12-181-1/+1
| | |
* | | Merge branch 'v7-stable-libnet-frag'Rainer Gerhards2012-12-182-86/+228
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/impstats/impstats.c plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h
| * | omudpspoof: remove dead codeRainer Gerhards2012-12-181-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | On-the-fly compression support code was present since the initial module was written, however, no config options existed to actually activate it. I have now removed that code for clarity (obviously there is no need to maintain it or add the feature - nobody ever complained in the past...)
| * | omudpspoof: improve libnet calling sequenceRainer Gerhards2012-12-181-18/+42
| | | | | | | | | | | | retains bugfix while increasing performance again
| * | omudpspoof: add action parameter for mtu sizeRainer Gerhards2012-12-181-3/+2
| | |
| * | omudpspoof: initialize libnet for each messageRainer Gerhards2012-12-181-27/+31
| | | | | | | | | | | | | | | This is a brute-force troubleshooting aid. Will later be changed to better code.
| * | add some better debug information to impstatsRainer Gerhards2012-12-181-0/+2
| | |
| * | omudpspoof: add support for new config systemRainer Gerhards2012-12-171-2/+97
| | |
| * | omudpspoof: add support for packets larger than 1472 bytesRainer Gerhards2012-12-171-15/+82
| | | | | | | | | | | | | | | | | | On Ethernet, they need to be transmitted in multiple fragments. While it is known that fragmentation can cause issues, it is the best choice to be made in that case. Also improved debug output.
* | | Merge branch 'v7-stable'Rainer Gerhards2012-12-171-9/+20
|\ \ \ | | |/ | |/|
| * | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-12-171-0/+6
| |\ \ | | |/ | |/| | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-12-171-1/+7
| | |\