Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
|\ | |||||
| * | bugfix: comments inside objects (e.g. action()) were not properly handled | Rainer Gerhards | 2012-10-04 | 1 | -0/+1 |
| | | |||||
* | | implement "continue" RainerScript statement | Rainer Gerhards | 2012-10-01 | 3 | -1/+9 |
| | | |||||
* | | bugfix: ruleset(){} directive errornously changed default ruleset | Rainer Gerhards | 2012-10-01 | 1 | -0/+1 |
| | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset. | ||||
* | | implement RainerScript "call" statement | Rainer Gerhards | 2012-10-01 | 4 | -4/+64 |
| | | |||||
* | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 2 | -5/+4 |
| | | |||||
* | | refactor: unify nodetypes | Rainer Gerhards | 2012-10-01 | 2 | -14/+14 |
| | | |||||
* | | fix: invalid free in array-based string comparisons | Rainer Gerhards | 2012-10-01 | 1 | -3/+7 |
| | | |||||
* | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 3 | -33/+134 |
| | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | cleanup | Rainer Gerhards | 2012-09-28 | 2 | -9/+0 |
| | | |||||
* | | implement RainerScript array-based string comparison operations | Rainer Gerhards | 2012-09-28 | 1 | -13/+77 |
| | | |||||
* | | rainerscript: add basic plumbing for arrays | Rainer Gerhards | 2012-09-28 | 4 | -5/+94 |
| | | | | | | | | | | can be used in expressions, but always evaluate to the first element, only | ||||
* | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 5 | -5/+17 |
| | | |||||
* | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 1 | -21/+108 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -21/+108 |
| | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-21 | 1 | -1/+1 |
| |\| | |||||
| * | | Free configuration objects after use | Miloslav Trmač | 2012-09-17 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | fix invalid free in PoC == optimization | Rainer Gerhards | 2012-09-25 | 1 | -1/+3 |
| | | | |||||
* | | | slight optimization of == in string comparisons | Rainer Gerhards | 2012-09-25 | 1 | -9/+17 |
| | | | |||||
* | | | detect unreachable statements and emit warning message | Rainer Gerhards | 2012-09-25 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-25 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| * | | | fix invalid free caused by optimized script execution | Rainer Gerhards | 2012-09-25 | 1 | -1/+2 |
| | | | | |||||
* | | | | fix small memory leak during script optimization | Rainer Gerhards | 2012-09-25 | 1 | -0/+2 |
| | | | | |||||
* | | | | fix optimizer-introduced memleak in action destruction | Rainer Gerhards | 2012-09-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Implement Script Optimizer: remove always-true PRIFILT | Rainer Gerhards | 2012-09-25 | 1 | -4/+44 |
| | | | | |||||
* | | | | cleanup & better debug output | Rainer Gerhards | 2012-09-24 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects | ||||
* | | | | Clean up implementation of omdiscard-->STOP optimization | Rainer Gerhards | 2012-09-24 | 1 | -2/+3 |
| | | | | |||||
* | | | | PoC: optimize omdicard --> STOP | Rainer Gerhards | 2012-09-24 | 1 | -2/+18 |
|/ / / | |||||
* | | | Improve script execution speed for important string-comparisons | Rainer Gerhards | 2012-09-21 | 1 | -2/+7 |
| | | | |||||
* | | | Merge branch 'v6-stable' into master-newruleset | Rainer Gerhards | 2012-09-21 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: grammar/lexer.l | ||||
| * | | Implemented different grammar for pri filters | Rainer Gerhards | 2012-09-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The method introduced by the previous commit caused issues in v7 as it was too generic. Most importantly, it permitted simple words (like "stop") to (invalidly) be detected as pri filters. Now, the grammar is close to the initial one, and each pri filter must at least have a comma or a period inside it, which does not conflict with simple words. | ||||
* | | | Merge branch 'v6-stable' into master-newruleset | Rainer Gerhards | 2012-09-21 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: grammar/lexer.l | ||||
| * | | bugfix: some valid legacy PRI filters were flagged as errornous | Rainer Gerhards | 2012-09-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=358 This happend to filters of the style "local0,local1.*", where the multiple facilities were comma-separated. | ||||
* | | | Implement script optimization IF -> PRIFILT | Rainer Gerhards | 2012-09-21 | 2 | -19/+65 |
| | | | |||||
* | | | Implement script optimizer basic constant folding & NOP removal | Rainer Gerhards | 2012-09-21 | 1 | -31/+164 |
| | | | |||||
* | | | Add skeleton for RainerScript optimizer | Rainer Gerhards | 2012-09-20 | 2 | -0/+84 |
| | | | | | | | | | | | | actual optimization is not yet done | ||||
* | | | Implement RainerScript prifield() function | Rainer Gerhards | 2012-09-20 | 2 | -3/+67 |
| | | | |||||
* | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 2 | -8/+107 |
| | | | |||||
* | | | new ruleengine: implement native JSON in RainerScript | Rainer Gerhards | 2012-09-18 | 2 | -9/+48 |
| | | | |||||
* | | | new ruleengine: implement script concatenation (& operator) | Rainer Gerhards | 2012-09-17 | 3 | -1/+12 |
| | | | |||||
* | | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-17 | 4 | -1/+58 |
|\ \ \ | |||||
| * | | | cleanup | Rainer Gerhards | 2012-09-17 | 1 | -6/+2 |
| | | | | |||||
| * | | | Add set/unset stmt to grammar & AST | Rainer Gerhards | 2012-09-13 | 4 | -1/+62 |
| | | | | | | | | | | | | | | | | ... but not yet to executing engine | ||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-14 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-14 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | Conflicts: runtime/rule.c | ||||
| | * | Fix length calculation for script string constants | Rainer Gerhards | 2012-09-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | This could lead to various problems, like if-filters not working. Note this is a regression from yesterdays escape fix, so there exist no released version with this problem. | ||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-13 | 3 | -2/+147 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 3 | -2/+147 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | ||||
| | * | Fixing string unescaping (new code from this morning's commit) | Rainer Gerhards | 2012-09-13 | 1 | -1/+1 |
| | | |