summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Implement ability for CEE-based properties to be stored in disk queuesRainer Gerhards2012-09-193-2/+23
| | | | |
* | | | | doc: announce new features in ChangeLogRainer Gerhards2012-09-191-0/+2
| | | | |
* | | | | bugfix: MsgDup() did not copy CEE structureRainer Gerhards2012-09-192-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | doc: begin rewrite of template docRainer Gerhards2012-09-191-42/+157
| | | | |
* | | | | subtree template parameter requires variable name, not CEE pathRainer Gerhards2012-09-181-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This was changed to keep things in rsyslog.conf consistent. Can also come handy if at some time we want to have a global (disjunct) CEE path.
* | | | | clarify: NO memleak, json_object_object_del() reduces reference countRainer Gerhards2012-09-181-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 treeRainer Gerhards2012-09-181-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree.
* | | | | new ruleengine: implement native JSON in RainerScriptRainer Gerhards2012-09-183-9/+51
| | | | |
* | | | | cleanupRainer Gerhards2012-09-182-559/+0
| | | | |
* | | | | new ruleengine: implement template type "subtree"Rainer Gerhards2012-09-187-30/+126
| | | | |
* | | | | new ruleengine: implement script concatenation (& operator)Rainer Gerhards2012-09-173-1/+12
| | | | |
* | | | | preparing for 7.1.3 releasev7.1.3Rainer Gerhards2012-09-173-3/+4
| | | | |
* | | | | Merge branch 'master-newruleset'Rainer Gerhards2012-09-178-17/+200
|\ \ \ \ \
| * | | | | new ruleengine: couple of fixes to new codeRainer Gerhards2012-09-171-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" statementRainer Gerhards2012-09-174-7/+72
| | | | | |
| * | | | | cleanupRainer Gerhards2012-09-171-6/+2
| | | | | |
| * | | | | Implement set config stmt (initial version)Rainer Gerhards2012-09-133-13/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;)
| * | | | | Add set/unset stmt to grammar & ASTRainer Gerhards2012-09-134-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | ... but not yet to executing engine
* | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-170-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Free configuration objects after useMiloslav Trmač2012-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-172-8/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | | | Fix other small memory leaks in template() processingRainer Gerhards2012-09-171-4/+7
| | | | | |
| * | | | | bugfix: small memory leaks in template() statementsRainer Gerhards2012-09-172-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime
* | | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-145-3/+23
|\| | | | | | |/ / / / |/| | | |
| * | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-145-3/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| | |\| |
| | | * | Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| | | | |
| | * | | 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.
| | * | | Fix new testbench testRainer Gerhards2012-09-141-1/+1
| | | | |
| | * | | Add test for script-based contains filter to testbenchRainer Gerhards2012-09-143-0/+20
| | | | |
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-136-80/+275
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | fix ChangeLogRainer Gerhards2012-09-131-3/+15
| | | | | | | | | | | | | | | | | | | | got messed-up during merge :-(
| * | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-136-80/+254
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| | * | | Fixing string unescaping (new code from this morning's commit)Rainer Gerhards2012-09-131-1/+1
| | | | |
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-132-78/+87
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c
| | | * | bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-132-56/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
| | * | | bugfix: missing support for escape sequences in RainerScriptRainer Gerhards2012-09-135-2/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | nit: correct messed-up ChangeLogRainer Gerhards2012-09-121-3/+5
| | | | |
* | | | | preparing for 7.1.2 releasev7.1.2Rainer Gerhards2012-09-123-2/+11
| | | | |
* | | | | new ruleengine: fix memory leakRainer Gerhards2012-09-121-0/+3
| | | | |
* | | | | another small cleanupRainer Gerhards2012-09-121-1/+0
| | | | |
* | | | | bugfix: abort when invalid property name was configuredRainer Gerhards2012-09-122-1/+7
| | | | |
* | | | | cleanupRainer Gerhards2012-09-121-1/+1
| | | | |
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-123-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l
| * | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-122-8/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-122-5/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-122-1/+9
| | | | |
| | | * | imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
| * | | | forward-compatibility patch for $ruleset processingRainer Gerhards2012-09-122-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | 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-123-4/+9
| | | | |