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 | 1 | -0/+1 |
| | | |||||
* | | implement RainerScript "call" statement | Rainer Gerhards | 2012-10-01 | 1 | -0/+8 |
| | | |||||
* | | rainerscript: add basic plumbing for arrays | Rainer Gerhards | 2012-09-28 | 1 | -2/+11 |
| | | | | | | | | | | can be used in expressions, but always evaluate to the first element, only | ||||
* | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 1 | -4/+5 |
| | | |||||
* | | 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. | ||||
* | | new ruleengine: implement script concatenation (& operator) | Rainer Gerhards | 2012-09-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-17 | 1 | -1/+5 |
|\ \ | |||||
| * | | Add set/unset stmt to grammar & AST | Rainer Gerhards | 2012-09-13 | 1 | -1/+5 |
| | | | | | | | | | | | | ... 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 | 1 | -2/+8 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 1 | -2/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | ||||
| | * | bugfix: missing support for escape sequences in RainerScript | Rainer Gerhards | 2012-09-13 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | Only \' was supported. Now the usual set is supported. Note that v5 used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. | ||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l | ||||
| * | | forward-compatibility patch for $ruleset processing | Rainer Gerhards | 2012-09-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | v7 needs a different handling, it's easer in the long term if we introduce this in v6 as well. Non-intrusive change. | ||||
* | | | new ruleengine: properly handle $ruleset directive | Rainer Gerhards | 2012-09-12 | 1 | -2/+5 |
| | | | |||||
* | | | new ruleengine: fix memory leaks & a little cleanup | Rainer Gerhards | 2012-09-10 | 1 | -4/+1 |
| | | | |||||
* | | | new ruleengine: properly freeing stmt tree | Rainer Gerhards | 2012-09-06 | 1 | -3/+1 |
| | | | |||||
* | | | new ruleengine: implement rainerscript execution engine | Rainer Gerhards | 2012-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | new ruleengine: script block correctly built | Rainer Gerhards | 2012-09-04 | 1 | -1/+1 |
| | | | |||||
* | | | new ruleengine: first code for stmt handling | Rainer Gerhards | 2012-09-04 | 1 | -0/+1 |
| | | | |||||
* | | | new ruleengine: first shot at grammar | Rainer Gerhards | 2012-09-03 | 1 | -3/+5 |
|/ / | |||||
* / | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 1 | -1/+7 |
|/ | |||||
* | conf file: bufgix: legacy parsing of some filters did not work correctly | Rainer Gerhards | 2012-02-01 | 1 | -1/+1 |
| | |||||
* | bugfix: facility local<x> was not correctly interpreted in legacy filters | Rainer Gerhards | 2011-09-28 | 1 | -1/+1 |
| | | | | | Was only accepted if it was the first PRI in a multi-filter PRI. Thanks to forum user Mark for bringing this to our attention. | ||||
* | bugfix: config parser did not support properties with dashes in them | Rainer Gerhards | 2011-09-15 | 1 | -1/+1 |
| | | | | ...inside property-based filters. Thanks to Gerrit Seré for reporting this. | ||||
* | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -3/+18 |
| | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
* | need to handle legacy-legacy omusrmsg format stricter | Rainer Gerhards | 2011-07-22 | 1 | -1/+1 |
| | | | | otherwise, the grammar for if-constructs was broken | ||||
* | omusrmsg now supports the new config system | Rainer Gerhards | 2011-07-21 | 1 | -1/+1 |
| | |||||
* | removed some printf's left in lexer | Rainer Gerhards | 2011-07-15 | 1 | -4/+5 |
| | | | | | may cause some mild confusion if someone actually uses the not-yet-officially-supported construct | ||||
* | forgotten to support the discard action ("~") | Rainer Gerhards | 2011-07-13 | 1 | -0/+1 |
| | |||||
* | lexer bug: *.somewhat PRIs not detected | Rainer Gerhards | 2011-07-13 | 1 | -1/+1 |
| | | | | regression from last update | ||||
* | removed emergency config, do error reporting on fatal config file error | Rainer Gerhards | 2011-07-12 | 1 | -4/+4 |
| | |||||
* | fixed lexer: facilities local0-local7 were not correctly handled | Rainer Gerhards | 2011-07-11 | 1 | -1/+5 |
| | |||||
* | cleaup & emergency config system reactivated | Rainer Gerhards | 2011-07-09 | 1 | -0/+23 |
| | |||||
* | milestone/[WORKS AGAIN!]: looks like the new conf format is integrated | Rainer Gerhards | 2011-07-09 | 1 | -1/+1 |
| | | | | finally completed $IncludeConfig processing. | ||||
* | milestone/[PARTWORK]: made sure all legacy selectors work | Rainer Gerhards | 2011-07-09 | 1 | -1/+2 |
| | | | | | ... except for the not guaranteed $outchannel construct, which we could not fix without syntax change. Shouldn't hurt too many. | ||||
* | milestone/[PARTWORK]: implemented comparison operations | Rainer Gerhards | 2011-07-08 | 1 | -0/+3 |
| | |||||
* | milestone/[PARTWORK]: integrted script filter, but var access is missing | Rainer Gerhards | 2011-07-07 | 1 | -3/+20 |
| | |||||
* | milestone: some plumbing for rsyslog/stand alone parsing | Rainer Gerhards | 2011-07-05 | 1 | -2/+2 |
| | |||||
* | milestone: improved build system | Rainer Gerhards | 2011-07-05 | 1 | -0/+251 |
... still had quite some glitches, as usual. This time it hopefully works under all circumstances (well, let's hope for "usual cir..." ;)). |