Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 6 | -13/+151 |
|\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | |||||
| * | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -0/+2 |
| | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | |||||
| * | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | |||||
| * | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 5 | -1/+96 |
| | | |||||
* | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 1 | -1/+0 |
|\| | |||||
| * | minor cleanup | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | |||||
* | | fix invalid state handling during action execution | Rainer Gerhards | 2012-09-25 | 1 | -2/+2 |
| | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression. | ||||
* | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-25 | 2 | -3/+4 |
|\ \ | | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| * | | fix invalid free caused by optimized script execution | Rainer Gerhards | 2012-09-25 | 3 | -2/+5 |
| | | | |||||
* | | | cosmetic: remove no-longer valid TODO item | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | |||||
* | | | fix optimizer-introduced memleak in action destruction | Rainer Gerhards | 2012-09-25 | 1 | -61/+63 |
| | | | |||||
* | | | cleanup & better debug output | Rainer Gerhards | 2012-09-24 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects | ||||
* | | | PoC: optimize omdicard --> STOP | Rainer Gerhards | 2012-09-24 | 2 | -1/+5 |
|/ / | |||||
* | | Merge branch 'v6-devel' into master-newruleset | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
|\| | |||||
| * | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
| |\ | | | | | | | | | | | | | Conflicts: runtime/glbl.c | ||||
| | * | Remove no longer needed function | Rainer Gerhards | 2012-09-23 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed"). | ||||
* | | | fix compile problem due to error in last commit | Rainer Gerhards | 2012-09-21 | 1 | -1/+0 |
| | | | |||||
* | | | Implement script optimization IF -> PRIFILT | Rainer Gerhards | 2012-09-21 | 1 | -10/+22 |
| | | | |||||
* | | | Add skeleton for RainerScript optimizer | Rainer Gerhards | 2012-09-20 | 3 | -0/+39 |
| | | | | | | | | | | | | actual optimization is not yet done | ||||
* | | | Merge branch 'v6-devel' into master-newruleset | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| |\| | |||||
| | * | Simplify | Rainer Gerhards | 2012-09-20 | 1 | -4/+1 |
| | | | |||||
| | * | Added missing iRet handler code into CheckConnection() in netstrm.c | Andre Lorbach | 2012-09-20 | 1 | -1/+4 |
| | | | |||||
* | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
|\| | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Fix missing Sysklogd template | Milan Bartos | 2012-09-20 | 1 | -0/+3 |
| | | | | | | | | | | | | modified: runtime/rsconf.c | ||||
* | | | bugfix: invalid debug message for normal operation | Rainer Gerhards | 2012-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | had no effect except on debug log | ||||
* | | | bugfix: debug output indicated improper queue type | Rainer Gerhards | 2012-09-19 | 1 | -0/+4 |
| | | | |||||
* | | | Implement ability for CEE-based properties to be stored in disk queues | Rainer Gerhards | 2012-09-19 | 1 | -0/+12 |
| | | | |||||
* | | | bugfix: MsgDup() did not copy CEE structure | Rainer Gerhards | 2012-09-19 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | This function was called at various places, most importantly during "last messages repeated n times" processing and omruleset. If CEE(JSON) data was present, it was lost as part of the copy process. | ||||
* | | | clarify: NO memleak, json_object_object_del() reduces reference count | Rainer Gerhards | 2012-09-18 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | json-c upstream made this clear some posts later in the discussion that I was refering to. | ||||
* | | | new ruleengine: do a deep copy for "set" statement affecting JSON tree | Rainer Gerhards | 2012-09-18 | 1 | -1/+50 |
| | | | | | | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree. | ||||
* | | | new ruleengine: implement native JSON in RainerScript | Rainer Gerhards | 2012-09-18 | 1 | -0/+3 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-09-18 | 2 | -559/+0 |
| | | | |||||
* | | | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 4 | -11/+42 |
| | | | |||||
* | | | 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 |