Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-26 | 1 | -0/+2 |
|\ | |||||
| * | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-26 | 1 | -0/+2 |
| |\ | |||||
| | * | require libestr 0.1.9 | Rainer Gerhards | 2013-10-26 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-26 | 1 | -0/+6 |
|\| | | |||||
| * | | doc: add enhancement to ChangeLog | Rainer Gerhards | 2013-10-26 | 1 | -0/+2 |
| | | | |||||
| * | | slight performance optimization if GCC is used | Rainer Gerhards | 2013-10-26 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | We give branch prediction hints for the frequent RETiRet macro which is used for error handling. Some slight performance gain is to be expected from that. | ||||
* | | | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-26 | 1 | -0/+3 |
|\| | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-26 | 1 | -0/+3 |
| |\| | |||||
| | * | bugfix: memory leak in strlen() RainerScript function | Rainer Gerhards | 2013-10-25 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | Thanks to Gregoire Seux for reportig this bug. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=486 | ||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-25 | 1 | -0/+4 |
| |\| | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-25 | 1 | -0/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'v7-stable-varfree' into master-var-refactor | Rainer Gerhards | 2013-10-25 | 1 | -0/+6 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | bugfix: buffer overrun if re_extract function was called for submatch 50 | Rainer Gerhards | 2013-10-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Thanks to Pavel Levshin for reporting the problem and its location. | ||||
| * | | | bugfix: memleak in re_extract() function | Rainer Gerhards | 2013-10-25 | 1 | -0/+2 |
| | |/ | |/| | | | | | | | Thanks to Pavel Levshin for reporting this problem. | ||||
| * | | doc: add fix to ChangeLog | Rainer Gerhards | 2013-10-25 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-24 | 1 | -1/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-24 | 1 | -1/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/msg.c | ||||
| | * | doc: update ChangeLog | Rainer Gerhards | 2013-10-24 | 1 | -0/+4 |
| | | | |||||
| | * | preparing for 7.4.5v7.4.5 | Rainer Gerhards | 2013-10-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-24 | 1 | -0/+10 |
|\| | | |||||
| * | | doc: update ChangeLog | Rainer Gerhards | 2013-10-24 | 1 | -0/+2 |
| | | | |||||
| * | | doc: add imuxsock fix to ChangeLog | Rainer Gerhards | 2013-10-24 | 1 | -0/+2 |
| | | | |||||
| * | | remove global variable support | Rainer Gerhards | 2013-10-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | The original idea was not well thought out and global variables, as implemented, worked far different from what anybody would expect. As such, we consider the current approach as an experiment that did not work out and opt to removing it, clearing the way for a better future solution. Note: global vars were introduced in 7.5.3 on Sept, 11th 2013. | ||||
* | | | bugfix: unset statement always worked on message var, even if local var was ↵ | Rainer Gerhards | 2013-10-23 | 1 | -0/+2 |
|/ / | | | | | | | given | ||||
* | | doc: document impstats ruleset parameter | Rainer Gerhards | 2013-10-20 | 1 | -0/+1 |
| | | |||||
* | | bugfix: imudp when using recvmmsg could report wrong sender IP | Rainer Gerhards | 2013-10-18 | 1 | -0/+1 |
| | | |||||
* | | bugfix: running imupd on multiple threads lead to segfault if recvmmsg is ↵ | Rainer Gerhards | 2013-10-18 | 1 | -0/+2 |
| | | | | | | | | available | ||||
* | | fix cosmetic memleak when property filter is disabled | Rainer Gerhards | 2013-10-18 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-18 | 1 | -0/+7 |
|\| | | | | | | | | | Conflicts: runtime/conf.c | ||||
| * | bugfix: invalid property filter was not properly disabled in ruleset | Rainer Gerhards | 2013-10-18 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | Note that this bugfix introduces a very slight memory leak, which is cosmetic, as it just holds data until termination that is no longer needed. It is just the part of the config that was invalid. We will "fix" this "issue" in the devel version first, as the fix is a bit too intrusive to do without hard need in the stable version. | ||||
* | | doc: mention bugfix in ChangeLog | Rainer Gerhards | 2013-10-18 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-18 | 1 | -0/+3 |
|\| | |||||
| * | doc: add last bugfix to ChangeLog | Rainer Gerhards | 2013-10-18 | 1 | -0/+3 |
| | | |||||
* | | bugfix: omelasticsearch did not compile on platforms without atomic instructions | Rainer Gerhards | 2013-10-18 | 1 | -0/+2 |
| | | |||||
* | | doc: mention imported bugfix | Rainer Gerhards | 2013-10-18 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-18 | 1 | -0/+1 |
|\| | |||||
| * | bugfix: segfault if re_extract() function was used and no match found | Rainer Gerhards | 2013-10-18 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-16 | 1 | -0/+1 |
|\| | |||||
| * | bugfix: omelasticsearch: failed.es counter was only maintained in bulk mode | Rainer Gerhards | 2013-10-16 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-16 | 1 | -0/+8 |
|\| | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c | ||||
| * | bugfix: omelasticsearch: did not correctly initialize stats counters | Rainer Gerhards | 2013-10-16 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | 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/+2 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-16 | 1 | -1/+1 |
|\| | |||||
| * | require libestr 0.1.8, as there are bugs in previous versions that affect us | Rainer Gerhards | 2013-10-16 | 1 | -1/+1 |
| | | |||||
* | | nit: fixing 7.5.5 release datev7.5.5 | Rainer Gerhards | 2013-10-16 | 1 | -1/+1 |
| | | |||||
* | | bugfix: imfile did not properly initialize strm object ptr | Rainer Gerhards | 2013-10-15 | 1 | -1/+25 |
| | | | | | | | | | | | | 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. | ||||
* | | imfile: permit to monitor an unlimited number of files | Rainer Gerhards | 2013-10-14 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-10-14 | 1 | -0/+11 |
|\| | |||||
| * | bugfix: mmanon did not detect all IP addresses in rewrite mode | Rainer Gerhards | 2013-10-14 | 1 | -1/+6 |
| | | | | | | | | | | | | | | 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 | -0/+6 |
| | | | | | | | | | | | | | | | | 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 |