summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-068-9/+40
|\
| * Merge branch 'v6-devel'Rainer Gerhards2012-09-069-11/+56
| |\
| | * Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-069-11/+56
| | |\
| | | * Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-257-9/+30
| | | * bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-283-2/+26
* | | | new ruleengine: some cleanupRainer Gerhards2012-09-067-104/+4
* | | | new ruleengine: implement rainerscript execution engineRainer Gerhards2012-09-065-3/+282
* | | | switch ruleset.h to ASL 2.0Rainer Gerhards2012-09-041-15/+13
* | | | new ruleengine: legacy action object properly constructedRainer Gerhards2012-09-043-6/+28
* | | | new ruleengine: v6+ action object properly constructedRainer Gerhards2012-09-043-1/+20
* | | | new ruleengine: PROP and PRI legacy filter structures properly createdRainer Gerhards2012-09-047-100/+155
* | | | new ruleengine: skeleton for reading conf file in placeRainer Gerhards2012-09-045-37/+46
* | | | new ruleengine: script block correctly builtRainer Gerhards2012-09-044-47/+83
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-044-38/+48
|\| | |
| * | | Fix reference countingMiloslav Trmač2012-09-041-1/+1
| * | | Don't leak configuration value arraysMiloslav Trmač2012-09-041-0/+4
| * | | Don't leak property nameMiloslav Trmač2012-09-041-1/+3
| * | | Free configuration objects after useMiloslav Trmač2012-09-041-1/+2
| * | | Don't store uninitialized data in trusted JSON propertiesMiloslav Trmač2012-09-041-9/+12
| * | | Don't overload length as error code indicator in getTrusted*Miloslav Trmač2012-09-041-12/+6
| * | | Fix a memory leak in "outname"Miloslav Trmač2012-09-041-1/+1
| * | | Free a temporary object for the "name" propertyMiloslav Trmač2012-09-041-2/+5
| * | | Set value of a mandatory JSON field to nullMiloslav Trmač2012-09-041-6/+1
| * | | bugfix: specifying json root in a template lead to abortRainer Gerhards2012-09-031-5/+13
* | | | new ruleengine: add &-operator (legacy action list)Rainer Gerhards2012-09-043-7/+11
* | | | new ruleengine: first code for stmt handlingRainer Gerhards2012-09-044-21/+110
* | | | new ruleengine: first shot at grammarRainer Gerhards2012-09-032-15/+27
|/ / /
* | | fix memory leakRainer Gerhards2012-08-311-4/+6
* | | add native json-passing to output modules using JSON APIRainer Gerhards2012-08-313-11/+66
* | | Merge branch 'master' into v7-develRainer Gerhards2012-08-314-32/+63
|\| |
| * | switch field default to "mandatory" and implement that modeRainer Gerhards2012-08-303-14/+19
| * | add capability to specify "optional" attribute for list-type templates, tooRainer Gerhards2012-08-291-0/+5
| * | Add support for optional fieldsMiloslav Trmač2012-08-293-0/+10
| * | default outname for $!<property> is now without $! prefixRainer Gerhards2012-08-294-31/+42
* | | Merge branch 'master' into v7-develRainer Gerhards2012-08-2917-85/+700
|\| |
| * | milestone: ommongodb supports templates & JSON passing API in placeRainer Gerhards2012-08-292-15/+10
| * | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-294-50/+27
| * | Add template support: parse text, convert to BSONMiloslav Trmač2012-08-293-12/+178
| * | Split MongoDB output into BSON creation and MongoDB interactionMiloslav Trmač2012-08-291-24/+27
| * | implement ACT_JSON_PASSINGRainer Gerhards2012-08-292-12/+56
| * | Merge branch 'master-jsonc' into master-jsonpassingRainer Gerhards2012-08-291-2/+5
| |\ \
| * | | add OMSR_TPL_AS_JSON mode for output modules (interface only)Rainer Gerhards2012-08-295-5/+19
| * | | bugfix: imtcp could abort on exit due to invalid free()Rainer Gerhards2012-08-282-1/+3
| * | | preparing for 6.5.0 releasev6.5.0Rainer Gerhards2012-08-282-2/+3
| * | | doc: new template system, some more output modulesRainer Gerhards2012-08-284-21/+434
* | | | Merge branch 'master' into v7-develRainer Gerhards2012-08-2714-21/+798
|\| | |
| * | | Merge branch 'master-uuid'Rainer Gerhards2012-08-276-4/+89
| |\ \ \
| | * | | made new uuid property threadsafeRainer Gerhards2012-08-262-15/+25
| | * | | add uuid property to message objectJérôme Renard2012-08-265-4/+79
| * | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-08-278-15/+695
| |\ \ \ \ | | |/ / / | |/| | |