summaryrefslogtreecommitdiffstats
path: root/grammar
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'v7-stable'Rainer Gerhards2012-11-091-17/+19
|\|
| * Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-091-16/+18
| |\ | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-091-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. Also minor bugfix: no error msg on unreadable $IncludeConfig path
| | * Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-0/+1
| | |\
| * | \ Merge branch 'v7.2.1-bugfix' into v7-stableRainer Gerhards2012-11-091-1/+1
| |\ \ \
| | * | | bugfix: potential segfault due to invalid param handling in comparisonsRainer Gerhards2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen in RainerScript comparisons (like contains); in some cases an unitialized variable was accessed, which could lead to an invalid free and in turn to a segfault. Closes: http://bugzilla.adiscon.com/show_bug.cgi?id=372 Thanks to Georgi Georgiev for reporting this bug and his great help in solving it.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-021-1/+0
|\| | | |
| * | | | bugfix: potential segfault when re_match() function was usedoxpa2012-11-021-1/+0
| |/ / / | | | | | | | | | | | | | | | | Thanks to oxpa for the patch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-291-1/+1
|\| | |
| * | | bugfix: ruleset()-object did only support a single statementRainer Gerhards2012-10-271-1/+1
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-241-1/+1
|\| | |
| * | | cleanupRainer Gerhards2012-10-241-1/+1
| | | |
* | | | permit action-like statements (stop, call, ...) in action listsRainer Gerhards2012-10-221-3/+4
|/ / /
* | | fix regression introduced by last commitRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | action object was created twice, resulting in memleak
* | | bugfixes in regards to action()Rainer Gerhards2012-10-111-0/+2
| | | | | | | | | | | | | | | - bugfix: small memory leak when processing action() statements - bugfix: unknown action() parameters were not reported
* | | bugfix: some config processing warning messages were treated as errorsRainer Gerhards2012-10-111-2/+6
| | |
* | | add missing prototypeRainer Gerhards2012-10-111-0/+1
| | |
* | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-091-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small.
* | | 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-013-1/+9
| | |
* | | bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-011-0/+1
| | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | implement RainerScript "call" statementRainer Gerhards2012-10-014-4/+64
| | |
* | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-012-5/+4
| | |
* | | refactor: unify nodetypesRainer Gerhards2012-10-012-14/+14
| | |
* | | fix: invalid free in array-based string comparisonsRainer Gerhards2012-10-011-3/+7
| | |
* | | implement string arrays for config objectsRainer Gerhards2012-10-013-33/+134
| | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | cleanupRainer Gerhards2012-09-282-9/+0
| | |
* | | implement RainerScript array-based string comparison operationsRainer Gerhards2012-09-281-13/+77
| | |
* | | rainerscript: add basic plumbing for arraysRainer Gerhards2012-09-284-5/+94
| | | | | | | | | | | | | | | can be used in expressions, but always evaluate to the first element, only
* | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-285-5/+17
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-271-21/+108
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-21/+108
| | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | cleanupRainer Gerhards2012-09-261-2/+0
| | |
| * | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-211-1/+1
| |\|
| * | Free configuration objects after useMiloslav Trmač2012-09-171-1/+2
| | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | fix invalid free in PoC == optimizationRainer Gerhards2012-09-251-1/+3
| | |
* | | slight optimization of == in string comparisonsRainer Gerhards2012-09-251-9/+17
| | |
* | | detect unreachable statements and emit warning messageRainer Gerhards2012-09-251-0/+3
| | |
* | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-251-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | fix invalid free caused by optimized script executionRainer Gerhards2012-09-251-1/+2
| | | |
* | | | fix small memory leak during script optimizationRainer Gerhards2012-09-251-0/+2
| | | |
* | | | fix optimizer-introduced memleak in action destructionRainer Gerhards2012-09-251-1/+1
| | | |
* | | | Implement Script Optimizer: remove always-true PRIFILTRainer Gerhards2012-09-251-4/+44
| | | |
* | | | cleanup & better debug outputRainer Gerhards2012-09-241-2/+6
| | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | | | Clean up implementation of omdiscard-->STOP optimizationRainer Gerhards2012-09-241-2/+3
| | | |
* | | | PoC: optimize omdicard --> STOPRainer Gerhards2012-09-241-2/+18
|/ / /
* | | Improve script execution speed for important string-comparisonsRainer Gerhards2012-09-211-2/+7
| | |
* | | 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.