summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-221-1/+1
| | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized.
* Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| |\ | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | * fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | |
* | | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+1
| | |
* | | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
| | |
* | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-023-8/+33
| | |
* | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | In that case, the CEE/lumberjack spec says MSG is NON-CEE and must be treated accordingly. This means no JSON parsing happens. The case is equal to missing CEE cookie. Also adapted module to new interfaces provided by msg object.
* | | bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-013-5/+10
| | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+5
| | |
* | | cleanupRainer Gerhards2012-10-011-1/+0
| | |
* | | implement string arrays for config objectsRainer Gerhards2012-10-011-0/+1
| | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-284-3/+59
| | |
* | | somewhat better debug outputRainer Gerhards2012-09-281-1/+3
| | |
* | | cleanupRainer Gerhards2012-09-281-5/+1
| | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code
* | | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-13/+151
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | |
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | cleanupRainer Gerhards2012-09-261-2/+0
| | | |
| * | | cleanupRainer Gerhards2012-09-261-3/+0
| | | |
| * | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-261-1/+0
|\| | |
| * | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | | |
* | | | fix invalid state handling during action executionRainer Gerhards2012-09-251-2/+2
| | | | | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression.
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-252-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | | fix invalid free caused by optimized script executionRainer Gerhards2012-09-253-2/+5
| | | | |
* | | | | cosmetic: remove no-longer valid TODO itemRainer Gerhards2012-09-251-1/+0
| | | | |
* | | | | fix optimizer-introduced memleak in action destructionRainer Gerhards2012-09-251-61/+63
| | | | |
* | | | | cleanup & better debug outputRainer Gerhards2012-09-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | | | | PoC: optimize omdicard --> STOPRainer Gerhards2012-09-242-1/+5
|/ / / /
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-231-7/+0
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| | * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* | | | fix compile problem due to error in last commitRainer Gerhards2012-09-211-1/+0
| | | |
* | | | Implement script optimization IF -> PRIFILTRainer Gerhards2012-09-211-10/+22
| | | |
* | | | Add skeleton for RainerScript optimizerRainer Gerhards2012-09-203-0/+39
| | | | | | | | | | | | | | | | actual optimization is not yet done
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-201-1/+1
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
| |\| |
| | * | SimplifyRainer Gerhards2012-09-201-4/+1
| | | |
| | * | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
| | | |
* | | | Implement RainerScript field() functionRainer Gerhards2012-09-201-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-201-0/+3
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+3
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | | | | | | | | | modified: runtime/rsconf.c
* | | | bugfix: invalid debug message for normal operationRainer Gerhards2012-09-191-1/+1
| | | | | | | | | | | | | | | | had no effect except on debug log
* | | | bugfix: debug output indicated improper queue typeRainer Gerhards2012-09-191-0/+4
| | | |
* | | | Implement ability for CEE-based properties to be stored in disk queuesRainer Gerhards2012-09-191-0/+12
| | | |
* | | | bugfix: MsgDup() did not copy CEE structureRainer Gerhards2012-09-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | 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.