summaryrefslogtreecommitdiffstats
path: root/grammar/lexer.l
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-0/+1
|\
| * bugfix: comments inside objects (e.g. action()) were not properly handledRainer Gerhards2012-10-041-0/+1
| |
* | implement "continue" RainerScript statementRainer Gerhards2012-10-011-0/+1
| |
* | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+8
| |
* | rainerscript: add basic plumbing for arraysRainer Gerhards2012-09-281-2/+11
| | | | | | | | | | can be used in expressions, but always evaluate to the first element, only
* | Implement RainerScript ruleset() statementRainer Gerhards2012-09-281-4/+5
| |
* | Merge branch 'v6-stable' into master-newrulesetRainer Gerhards2012-09-211-1/+1
|\| | | | | | | | | Conflicts: grammar/lexer.l
| * Implemented different grammar for pri filtersRainer Gerhards2012-09-211-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-newrulesetRainer Gerhards2012-09-211-1/+1
|\| | | | | | | | | Conflicts: grammar/lexer.l
| * bugfix: some valid legacy PRI filters were flagged as errornousRainer Gerhards2012-09-211-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 Gerhards2012-09-171-0/+1
| |
* | Merge branch 'master-newruleset'Rainer Gerhards2012-09-171-1/+5
|\ \
| * | Add set/unset stmt to grammar & ASTRainer Gerhards2012-09-131-1/+5
| | | | | | | | | | | | ... but not yet to executing engine
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-141-2/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-141-2/+2
| |\| | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * Fix length calculation for script string constantsRainer Gerhards2012-09-141-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 Gerhards2012-09-131-2/+8
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-131-2/+8
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| | * bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-131-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 Gerhards2012-09-121-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-121-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 directiveRainer Gerhards2012-09-121-2/+5
| | |
* | | new ruleengine: fix memory leaks & a little cleanupRainer Gerhards2012-09-101-4/+1
| | |
* | | new ruleengine: properly freeing stmt treeRainer Gerhards2012-09-061-3/+1
| | |
* | | new ruleengine: implement rainerscript execution engineRainer Gerhards2012-09-061-1/+1
| | |
* | | new ruleengine: script block correctly builtRainer Gerhards2012-09-041-1/+1
| | |
* | | new ruleengine: first code for stmt handlingRainer Gerhards2012-09-041-0/+1
| | |
* | | new ruleengine: first shot at grammarRainer Gerhards2012-09-031-3/+5
|/ /
* / add base plumbing for template() config object to grammarRainer Gerhards2012-08-241-1/+7
|/
* conf file: bufgix: legacy parsing of some filters did not work correctlyRainer Gerhards2012-02-011-1/+1
|
* bugfix: facility local<x> was not correctly interpreted in legacy filtersRainer Gerhards2011-09-281-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 themRainer Gerhards2011-09-151-1/+1
| | | | ...inside property-based filters. Thanks to Gerrit Seré for reporting this.
* milestone: queue object now has a param handler for new conf interfaceRainer Gerhards2011-07-221-3/+18
| | | | ... and action queue defs use this new interface (but not yet the main queues)
* need to handle legacy-legacy omusrmsg format stricterRainer Gerhards2011-07-221-1/+1
| | | | otherwise, the grammar for if-constructs was broken
* omusrmsg now supports the new config systemRainer Gerhards2011-07-211-1/+1
|
* removed some printf's left in lexerRainer Gerhards2011-07-151-4/+5
| | | | | may cause some mild confusion if someone actually uses the not-yet-officially-supported construct
* forgotten to support the discard action ("~")Rainer Gerhards2011-07-131-0/+1
|
* lexer bug: *.somewhat PRIs not detectedRainer Gerhards2011-07-131-1/+1
| | | | regression from last update
* removed emergency config, do error reporting on fatal config file errorRainer Gerhards2011-07-121-4/+4
|
* fixed lexer: facilities local0-local7 were not correctly handledRainer Gerhards2011-07-111-1/+5
|
* cleaup & emergency config system reactivatedRainer Gerhards2011-07-091-0/+23
|
* milestone/[WORKS AGAIN!]: looks like the new conf format is integratedRainer Gerhards2011-07-091-1/+1
| | | | finally completed $IncludeConfig processing.
* milestone/[PARTWORK]: made sure all legacy selectors workRainer Gerhards2011-07-091-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 operationsRainer Gerhards2011-07-081-0/+3
|
* milestone/[PARTWORK]: integrted script filter, but var access is missingRainer Gerhards2011-07-071-3/+20
|
* milestone: some plumbing for rsyslog/stand alone parsingRainer Gerhards2011-07-051-2/+2
|
* milestone: improved build systemRainer Gerhards2011-07-051-0/+251
... still had quite some glitches, as usual. This time it hopefully works under all circumstances (well, let's hope for "usual cir..." ;)).