Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-17 | 4 | -16/+142 | |
|\ \ \ | ||||||
| * | | | new ruleengine: couple of fixes to new code | Rainer Gerhards | 2012-09-17 | 1 | -4/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - memory leak if container was tried to replace - too early free due to invalid reference counting - performance improvement for set statement | |||||
| * | | | new ruleengine: Implent "unset" statement | Rainer Gerhards | 2012-09-17 | 4 | -7/+72 | |
| | | | | ||||||
| * | | | Implement set config stmt (initial version) | Rainer Gerhards | 2012-09-13 | 3 | -13/+67 | |
| | | | | | | | | | | | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;) | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | Conflicts: runtime/rule.c | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Debug logging slightly improved | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-13 | 1 | -78/+83 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 1 | -78/+83 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-13 | 1 | -78/+83 | |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c | |||||
| | | * | bugfix: invalid property name in property-filter could cause abort | Rainer Gerhards | 2012-09-13 | 1 | -56/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report | |||||
* | | | | another small cleanup | Rainer Gerhards | 2012-09-12 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | bugfix: abort when invalid property name was configured | Rainer Gerhards | 2012-09-12 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | new ruleengine: fixed action handling in regard to filters | Rainer Gerhards | 2012-09-12 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | This was not yet adapted to the new "active" structure. | |||||
* | | | | new ruleengine: bugfix, messages were processed multiple times | Rainer Gerhards | 2012-09-12 | 1 | -10/+2 | |
| | | | | ||||||
* | | | | new ruleengine: properly remove BSD-style blocks | Rainer Gerhards | 2012-09-11 | 4 | -98/+11 | |
| | | | | ||||||
* | | | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-10 | 8 | -299/+399 | |
|\ \ \ \ | ||||||
| * | | | | new ruleengine: cleanup | Rainer Gerhards | 2012-09-07 | 2 | -54/+0 | |
| | | | | | ||||||
| * | | | | new ruleengine: properly freeing stmt tree | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | new ruleengine: restore action iterator functionality | Rainer Gerhards | 2012-09-06 | 2 | -47/+38 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 5 | -8/+17 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c | |||||
| * | | | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 6 | -99/+4 | |
| | | | | | | ||||||
| * | | | | | new ruleengine: implement rainerscript execution engine | Rainer Gerhards | 2012-09-06 | 2 | -1/+279 | |
| | | | | | | ||||||
| * | | | | | switch ruleset.h to ASL 2.0 | Rainer Gerhards | 2012-09-04 | 1 | -15/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a single contribution from varmojfekoj, and that has been removed some time ago. So I am the sole copyright holder and can change the license. | |||||
| * | | | | | new ruleengine: PROP and PRI legacy filter structures properly created | Rainer Gerhards | 2012-09-04 | 3 | -77/+43 | |
| | | | | | | ||||||
| * | | | | | new ruleengine: skeleton for reading conf file in place | Rainer Gerhards | 2012-09-04 | 3 | -2/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | code still does not work, actual functions not implemented | |||||
* | | | | | | bugfix: string-generating templates caused abort if CEE field could not be found | Rainer Gerhards | 2012-09-10 | 1 | -3/+8 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-06 | 6 | -10/+33 | |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 6 | -10/+33 | |
| |\| | | ||||||
| | * | | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 5 | -8/+17 | |
| | | | | | | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly. | |||||
| | * | | bugfix: omusrsmsg incorrect return state & config warning handling | Rainer Gerhards | 2012-08-28 | 1 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug. | |||||
* | | | | bugfix: specifying json root in a template lead to abort | Rainer Gerhards | 2012-09-03 | 1 | -5/+13 | |
| | | | | | | | | | | | | | | | | Thanks to Miloslav Trmač for alerting us of this problem. | |||||
* | | | | fix memory leak | Rainer Gerhards | 2012-08-31 | 1 | -4/+6 | |
| | | | | ||||||
* | | | | add native json-passing to output modules using JSON API | Rainer Gerhards | 2012-08-31 | 2 | -1/+35 | |
| | | | | ||||||
* | | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-31 | 1 | -2/+2 | |
|\| | | | ||||||
| * | | | default outname for $!<property> is now without $! prefix | Rainer Gerhards | 2012-08-29 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | also some type cleanup and simplification | |||||
* | | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-29 | 3 | -4/+7 | |
|\| | | | ||||||
| * | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development | |||||
| * | | | add OMSR_TPL_AS_JSON mode for output modules (interface only) | Rainer Gerhards | 2012-08-29 | 2 | -4/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This patch does NOT contain any implementation, this will happen next. Thanks to Miloslav Trmac, who suggested a similar mode, which I based the JSON idea on. | |||||
* | | | | Merge branch 'master' into v7-devel | Rainer Gerhards | 2012-08-27 | 4 | -7/+85 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | |||||
| * | | | Merge branch 'master-uuid' | Rainer Gerhards | 2012-08-27 | 3 | -3/+69 | |
| |\ \ \ | ||||||
| | * | | | made new uuid property threadsafe | Rainer Gerhards | 2012-08-26 | 1 | -15/+21 | |
| | | | | | ||||||
| | * | | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 3 | -3/+63 | |
| | | | | | ||||||
| * | | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-08-27 | 2 | -3/+15 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: runtime/msg.c | |||||
| | * | | | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | also some cleanup | |||||
| | * | | | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 1 | -5/+6 | |
| | | | | | ||||||
| | * | | | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 10 | -34/+71 | |
| | |\ \ \ | ||||||
| | * | | | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 | |
| | | | | | |