Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Implement ability for CEE-based properties to be stored in disk queues | Rainer Gerhards | 2012-09-19 | 3 | -2/+23 | |
| | | | | | ||||||
* | | | | | doc: announce new features in ChangeLog | Rainer Gerhards | 2012-09-19 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | bugfix: MsgDup() did not copy CEE structure | Rainer Gerhards | 2012-09-19 | 2 | -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 doc | Rainer Gerhards | 2012-09-19 | 1 | -42/+157 | |
| | | | | | ||||||
* | | | | | subtree template parameter requires variable name, not CEE path | Rainer Gerhards | 2012-09-18 | 1 | -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 count | Rainer Gerhards | 2012-09-18 | 1 | -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 tree | Rainer Gerhards | 2012-09-18 | 1 | -1/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, further modifications will modify the original and "copied" JSON tree. | |||||
* | | | | | new ruleengine: implement native JSON in RainerScript | Rainer Gerhards | 2012-09-18 | 3 | -9/+51 | |
| | | | | | ||||||
* | | | | | cleanup | Rainer Gerhards | 2012-09-18 | 2 | -559/+0 | |
| | | | | | ||||||
* | | | | | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 7 | -30/+126 | |
| | | | | | ||||||
* | | | | | new ruleengine: implement script concatenation (& operator) | Rainer Gerhards | 2012-09-17 | 3 | -1/+12 | |
| | | | | | ||||||
* | | | | | preparing for 7.1.3 releasev7.1.3 | Rainer Gerhards | 2012-09-17 | 3 | -3/+4 | |
| | | | | | ||||||
* | | | | | Merge branch 'master-newruleset' | Rainer Gerhards | 2012-09-17 | 8 | -17/+200 | |
|\ \ \ \ \ | ||||||
| * | | | | | new ruleengine: couple of fixes to new code | Rainer Gerhards | 2012-09-17 | 1 | -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" statement | Rainer Gerhards | 2012-09-17 | 4 | -7/+72 | |
| | | | | | | ||||||
| * | | | | | cleanup | Rainer Gerhards | 2012-09-17 | 1 | -6/+2 | |
| | | | | | | ||||||
| * | | | | | Implement set config stmt (initial version) | Rainer Gerhards | 2012-09-13 | 3 | -13/+67 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code passes basic tests, no extended testing done. Definitely room for improvement, but not bad ;) | |||||
| * | | | | | 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-17 | 0 | -0/+0 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Free configuration objects after use | Miloslav Trmač | 2012-09-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com> | |||||
* | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-17 | 2 | -8/+11 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c | |||||
| * | | | | | Fix other small memory leaks in template() processing | Rainer Gerhards | 2012-09-17 | 1 | -4/+7 | |
| | | | | | | ||||||
| * | | | | | bugfix: small memory leaks in template() statements | Rainer Gerhards | 2012-09-17 | 2 | -3/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these were one-time memory leaks during startup, so they did NOT grow during runtime | |||||
* | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-14 | 5 | -3/+23 | |
|\| | | | | | |/ / / / |/| | | | | ||||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-14 | 5 | -3/+23 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c | |||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | |\| | | ||||||
| | | * | | Debug logging slightly improved | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | 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. | |||||
| | * | | | Fix new testbench test | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add test for script-based contains filter to testbench | Rainer Gerhards | 2012-09-14 | 3 | -0/+20 | |
| | | | | | ||||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-13 | 6 | -80/+275 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| * | | | | fix ChangeLog | Rainer Gerhards | 2012-09-13 | 1 | -3/+15 | |
| | | | | | | | | | | | | | | | | | | | | got messed-up during merge :-( | |||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 6 | -80/+254 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | ||||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-13 | 2 | -78/+87 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rule.c | |||||
| | | * | | bugfix: invalid property name in property-filter could cause abort | Rainer Gerhards | 2012-09-13 | 2 | -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 RainerScript | Rainer Gerhards | 2012-09-13 | 5 | -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 ChangeLog | Rainer Gerhards | 2012-09-12 | 1 | -3/+5 | |
| | | | | | ||||||
* | | | | | preparing for 7.1.2 releasev7.1.2 | Rainer Gerhards | 2012-09-12 | 3 | -2/+11 | |
| | | | | | ||||||
* | | | | | new ruleengine: fix memory leak | Rainer Gerhards | 2012-09-12 | 1 | -0/+3 | |
| | | | | | ||||||
* | | | | | another small cleanup | Rainer Gerhards | 2012-09-12 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | bugfix: abort when invalid property name was configured | Rainer Gerhards | 2012-09-12 | 2 | -1/+7 | |
| | | | | | ||||||
* | | | | | cleanup | Rainer Gerhards | 2012-09-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 3 | -6/+10 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l | |||||
| * | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 2 | -8/+10 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 2 | -5/+11 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | |||||
| | | * | | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 2 | -1/+9 | |
| | | | | | ||||||
| | | * | | imuxsock: remove incorrect socket option call | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -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 processing | Rainer Gerhards | 2012-09-12 | 2 | -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 directive | Rainer Gerhards | 2012-09-12 | 3 | -4/+9 | |
| | | | | |