summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |\
| | | * bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size)Rainer Gerhards2012-12-171-1/+7
| | | | | | | | | | | | | | | | | | | | it now truncates these message, but ensures they are sent. Note that 7.2.5+ will switch to fragmented UDP messages instead (up to 64K)
| * | | omudpspoof: better debug outputRainer Gerhards2012-12-171-10/+14
| | | |
| * | | add extra debug info to tackle omudpspoof problemRainer Gerhards2012-12-171-0/+1
| | | |
* | | | bugfix: very minimal bugfix in imfileRainer Gerhards2012-12-141-0/+2
| | | | | | | | | | | | | | | | | | | | not really relevant for production, a few KB were lost during initialization phase if no state file was present
* | | | bugfix: small, mostly static memory leak in imtcpRainer Gerhards2012-12-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This had no practical effect, a handful of bytes was lost at most, no matter how many messages were processed (leak in config processor).
* | | | ommysql: addd batching/transaction supportUlrike Gerhards2012-12-141-4/+28
| | | |
* | | | minor cleanupRainer Gerhards2012-12-141-2/+12
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-12-131-1/+1
|\| | |
| * | | build: link omelasticsearch against -lmMichael Biebl2012-12-131-1/+1
| | | | | | | | | | | | | | | | Use LT_LIB_M to find the math library which is needed for pow().
* | | | Merge branch 'v7-stable-newmsglock' into master-newmsglockRainer Gerhards2012-12-061-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c
| * | | permit RFC3339 timestamp in local log socket messagesSebastien Ponce2012-12-031-3/+7
| | | | | | | | | | | | | | | | Released under ASL 2.0, permission given via email.
* | | | bugfix[minor]: invalid error code when mmnormalize could not access rulebaseRainer Gerhards2012-11-301-3/+3
| | | |
* | | | bugfix: segfault on imuxsock startup if system log socket is used and no ↵Rainer Gerhards2012-11-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ratelimiting supported. Happens only during initial config read phase, once this is over, everything works stable.
* | | | bugfix: mmnormalize could abort rsyslog if config parameter was in errorRainer Gerhards2012-11-281-1/+5
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-2811-5/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c
| * | | silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-282-3/+12
| | | |
| * | | bugfix: modules not (yet) supporting new conf format were not properly ↵Rainer Gerhards2012-11-289-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | registered This lead to a "module not found" error message instead of the to-be-expected "module does not support new style" error message. That invalid error message could be quite misleading and actually stop people from addressing the real problem (aka "go nuts" ;))
| * | | bugfix: supportoctetcountedframing parameter did not work in imptcpRainer Gerhards2012-11-251-1/+1
| | | |
* | | | bugfix: mmnormalize build problemsRainer Gerhards2012-11-271-6/+3
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-223-17/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-223-25/+49
| |\| |
| | * | imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
| | | | | | | | | | | | | | | | | | | | This is based on Marius Tomaschewski's set of patches, mostly just applied manually (as I need to mangle with the merge).
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-223-25/+43
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h
| | | * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-221-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschwesky for the bug report and the patch idea.
| | | * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-213-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time.
| | | * imklog: added $klogKeepKernelTimestamp optionMarius Tomaschewski2012-11-213-2/+8
| | | | | | | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too.
| * | | minor cleanupRainer Gerhards2012-11-151-8/+0
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-143-5/+10
|\| | |
| * | | silence compiler warnings & some cleanupRainer Gerhards2012-11-141-5/+1
| | | |
| * | | bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a real problem (thus no ChangeLog entry): we leaked a few bytes for every relp listener, but only at rsyslogd TERMINATION - where obviously the OS does the cleanup. However, the leak could cause some confusion with memory checkers like valgrind.
| * | | bugfix: make rsyslog compile on kfreebsd againGuillem Jover2012-11-141-0/+2
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-131-1/+1
|\| | |