Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |||||
* | | | | 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 |