summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-13/+151
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | |
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | cleanupRainer Gerhards2012-09-261-2/+0
| | | |
| * | | cleanupRainer Gerhards2012-09-261-3/+0
| | | |
| * | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-261-1/+0
|\| | |
| * | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | | |
* | | | fix invalid state handling during action executionRainer Gerhards2012-09-251-2/+2
| | | | | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression.
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-252-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | | fix invalid free caused by optimized script executionRainer Gerhards2012-09-253-2/+5
| | | | |
* | | | | cosmetic: remove no-longer valid TODO itemRainer Gerhards2012-09-251-1/+0
| | | | |
* | | | | fix optimizer-introduced memleak in action destructionRainer Gerhards2012-09-251-61/+63
| | | | |
* | | | | cleanup & better debug outputRainer Gerhards2012-09-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | | | | PoC: optimize omdicard --> STOPRainer Gerhards2012-09-242-1/+5
|/ / / /
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-231-7/+0
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| | * | Remove no longer needed functionRainer Gerhards2012-09-231-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 commitRainer Gerhards2012-09-211-1/+0
| | | |
* | | | Implement script optimization IF -> PRIFILTRainer Gerhards2012-09-211-10/+22
| | | |
* | | | Add skeleton for RainerScript optimizerRainer Gerhards2012-09-203-0/+39
| | | | | | | | | | | | | | | | actual optimization is not yet done
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-201-1/+1
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
| |\| |
| | * | SimplifyRainer Gerhards2012-09-201-4/+1
| | | |
| | * | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
| | | |
* | | | Implement RainerScript field() functionRainer Gerhards2012-09-201-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-201-0/+3
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+3
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | | | | | | | | | modified: runtime/rsconf.c
* | | | bugfix: invalid debug message for normal operationRainer Gerhards2012-09-191-1/+1
| | | | | | | | | | | | | | | | had no effect except on debug log
* | | | bugfix: debug output indicated improper queue typeRainer Gerhards2012-09-191-0/+4
| | | |
* | | | Implement ability for CEE-based properties to be stored in disk queuesRainer Gerhards2012-09-191-0/+12
| | | |
* | | | bugfix: MsgDup() did not copy CEE structureRainer Gerhards2012-09-191-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 countRainer Gerhards2012-09-181-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 treeRainer Gerhards2012-09-181-1/+50
| | | | | | | | | | | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree.
* | | | new ruleengine: implement native JSON in RainerScriptRainer Gerhards2012-09-181-0/+3
| | | |
* | | | cleanupRainer Gerhards2012-09-182-559/+0
| | | |
* | | | new ruleengine: implement template type "subtree"Rainer Gerhards2012-09-184-11/+42
| | | |
* | | | Merge branch 'master-newruleset'Rainer Gerhards2012-09-174-16/+142
|\ \ \ \
| * | | | new ruleengine: couple of fixes to new codeRainer Gerhards2012-09-171-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" statementRainer Gerhards2012-09-174-7/+72
| | | | |
| * | | | Implement set config stmt (initial version)Rainer Gerhards2012-09-133-13/+67
| | | | | | | | | | | | | | | | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;)
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-141-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-141-1/+1
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| | |\|
| | | * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-131-78/+83
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-131-78/+83
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| | * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-131-78/+83
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| | | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-131-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