Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-24 | 1 | -4/+4 |
|\ | |||||
| * | imuxsock: add some clarifiying comments | Rainer Gerhards | 2013-10-24 | 1 | -2/+4 |
| | | |||||
| * | imuxsock: When syssock.use set to off, additional listeners cannot be created | Pavel Levshin | 2013-10-24 | 1 | -2/+0 |
| | | |||||
* | | refactor: use common code for message property description processing | Rainer Gerhards | 2013-10-22 | 1 | -6/+12 |
| | | | | | | | | in all cases except script var access -- this comes next... | ||||
* | | work a bit toward string handling unification | Rainer Gerhards | 2013-10-21 | 1 | -5/+5 |
|/ | |||||
* | impstats: initial shot at multi-ruleset support | Rainer Gerhards | 2013-10-19 | 1 | -1/+39 |
| | |||||
* | bugfix: imudp when using recvmmsg could report wrong sender IP | Rainer Gerhards | 2013-10-18 | 1 | -3/+5 |
| | |||||
* | cosmetic: remove compiler warnings | Rainer Gerhards | 2013-10-18 | 1 | -3/+0 |
| | |||||
* | bugfix: running imupd on multiple threads lead to segfault if recvmmsg is ↵ | Rainer Gerhards | 2013-10-18 | 1 | -34/+43 |
| | | | | available | ||||
* | remove compiler warning | Rainer Gerhards | 2013-10-18 | 1 | -2/+2 |
| | |||||
* | remove no longer needed variable | Rainer Gerhards | 2013-10-18 | 1 | -1/+0 |
| | |||||
* | bugfix: omelasticsearch did not compile on platforms without atomic instructions | Rainer Gerhards | 2013-10-18 | 1 | -5/+5 |
| | |||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-16 | 1 | -3/+3 |
|\ | |||||
| * | bugfix: omelasticsearch: failed.es counter was only maintained in bulk mode | Rainer Gerhards | 2013-10-16 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-16 | 1 | -5/+16 |
|\| | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
| * | bugfix: omelasticsearch: did not correctly initialize stats counters | Rainer Gerhards | 2013-10-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | This usually did not lead to any problems, because they are in static memory, which is initialized to zero by the OS when the plugin is loaded. But it may cause problems especially on systems that do not support atomic instructions - in this case the associated mutexes also did not get properly initialized. | ||||
| * | omelasticsearch: add failed.httprequests stats counter | Rainer Gerhards | 2013-10-16 | 1 | -0/+5 |
| | | |||||
| * | bugfix omelasticsearch: failed.http stats counter had incorrect count | Rainer Gerhards | 2013-10-16 | 1 | -5/+8 |
| | | |||||
* | | bugfix: imfile did not properly initialize strm object ptr | Rainer Gerhards | 2013-10-15 | 1 | -0/+1 |
| | | | | | | | | | | | | This did not cause any real issue, as with the current config system the zerod-out static memory actually was initialized. However, this posed problems after we moved to dynamic memory alloc. | ||||
* | | mmutf8fix: compile problem & potential misadressing at end of message | Rainer Gerhards | 2013-10-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | this is a regression of a recently-done bugfix, which I unfortunately did not test correctly (accidently, compilation for this module was not enabled). Thanks to Risto Vaarandi for alerting me. | ||||
* | | imfile: permit to monitor an unlimited number of files | Rainer Gerhards | 2013-10-14 | 1 | -26/+51 |
| | | |||||
* | | imfile: improve config file parameter validation | Rainer Gerhards | 2013-10-14 | 1 | -0/+66 |
| | | |||||
* | | cleanup: remove some code that stems back to the module sample code | Rainer Gerhards | 2013-10-14 | 1 | -30/+2 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-14 | 1 | -1/+2 |
|\| | |||||
| * | bugfix: mmanon did not detect all IP addresses in rewrite mode | Rainer Gerhards | 2013-10-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | The problem occured if two IPs were close to each other and the first one was shrunk. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=485 Thanks to micah-at-riseup.net for reporting this bug | ||||
| * | bugfix: mmanon sometimes used invalid replacement char in simple mode | Rainer Gerhards | 2013-10-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | depending on configuration sequence, the replacement character was set to 's' instead of the correct value. Most importantly, it was set to 's' if simple mode was selected and no replacement char set. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=484 Thanks to micah-at-riseup.net for reporting this bug | ||||
* | | 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 |
| | | | |||||
* | | | imudp: reduce resource usage | Rainer Gerhards | 2013-10-11 | 1 | -3/+10 |
| | | | | | | | | | | | | we utilize the imudp main thread to act as a worker itself | ||||
* | | | imudp: support for multiple receiver threads added | Rainer Gerhards | 2013-10-11 | 1 | -21/+104 |
| | | | |||||
* | | | bugfix: mmutf8fix did not properly handle invalid UTF-8 at END of message | Rainer Gerhards | 2013-10-10 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | if the very last character sequence was too long, this was not detected Thanks to Risto Vaarandi for reporting this problem. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-10 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | bugfix: memory leak in mmnormalize | Rainer Gerhards | 2013-10-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'c9' | Rainer Gerhards | 2013-10-09 | 1 | -0/+10 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imudp/imudp.c | ||||
| * | | imudp: add "defaultTZ" input config parameter | Rainer Gerhards | 2013-10-09 | 1 | -0/+10 |
| | | | |||||
| * | | impstats: implement parameter "resetCounters" | Rainer Gerhards | 2013-09-09 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it provides the capability to make impstats emit deltas in contrast to accumulated counter values (see doc for details). Conflicts: plugins/impstats/impstats.c | ||||
| * | | experimental: make impstats return delta values where possible | Rainer Gerhards | 2013-09-09 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c plugins/imptcp/imptcp.c | ||||
| * | | Merge branch 'v7-stable' into c9 | Rainer Gerhards | 2013-09-09 | 7 | -8/+8 |
| |\ \ | |||||
* | \ \ | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-04 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | mmanon: removed the check for specific "terminator characters" after last octet | Rainer Gerhards | 2013-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it turned out, this didn't work in practice as there was an enormous set of potential terminator chars -- so removing them was the best thing to do. Note that this may change behaviour of existing installations. Yet, we still consider this an important bugfix, that should be applied to the stable branch. | ||||
| * | | | mmanon: added "]" to set of acceptable chars after an IPv4 address | Rainer Gerhards | 2013-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is used in Exim and Postfix ... and probably a bunch of other tools closes: http://bugzilla.adiscon.com/show_bug.cgi?id=477 Thanks to Muri Cicanor for requesting the addition | ||||
* | | | | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | mmrfc5424addhmac: correctly handle empty structured data | Rainer Gerhards | 2013-09-26 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-26 | 1 | -1/+5 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: plugins/omprog/omprog.c | ||||
| * | | | | bugfix: omprog blocked signals to executed process | Risto Vaarandi | 2013-09-26 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 5 | -104/+574 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/msg.c runtime/rsyslog.h | ||||
| * | | | | mmrfc5424addhmac: complete initial implementation | Rainer Gerhards | 2013-09-25 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | hash is now also persisted back to structured-data rsyslog property | ||||
| * | | | | mmrfc5424addhmac milestone: detect if "our" SD-ID is already present | Rainer Gerhards | 2013-09-24 | 1 | -8/+115 |
| | | | | | | | | | | | | | | | | | | | | ... and stop processing in this case (as required) | ||||
| * | | | | mmpstrucdata: add structured data in explicit subtree | Rainer Gerhards | 2013-09-24 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | milestone: mmpstrucdata persists to json tree | Rainer Gerhards | 2013-09-23 | 1 | -19/+18 |
| | | | | | | | | | | | | | | | | | | | | but not yet to a specific subtree |