Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 2 | -10/+11 |
| | | | | | | | 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. | ||||
* | Change mmjsonparse so non-json messages doesn't get lost from ceelog | Milan Bartos | 2012-10-02 | 1 | -0/+9 |
| | | | | modified: mmjsonparse.c | ||||
* | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 4 | -0/+482 |
|\ | |||||
| * | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 4 | -456/+482 |
| | | |||||
| * | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | | |||||
* | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 2 | -1/+3 |
|\| | |||||
| * | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-02 | 2 | -1/+3 |
| |\ | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| | |\ | |||||
| | | * | minor: disable debug support in complex1.sh test | Rainer Gerhards | 2012-10-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-02 | 3 | -3/+5 |
| | |\| | |||||
| | | * | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | | |||||
| | | * | bugfix: fixed wrong bufferlength for snprintf in tcpflood.c | Andre Lorbach | 2012-09-28 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | The problem occured when using the -f (dynafiles) option, and caused some tests to fail. | ||||
* | | | | minor: mention better doc in ChangeLog | Rainer Gerhards | 2012-10-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | doc: update module doc to new capabilities | Florian Riedl | 2012-10-02 | 6 | -64/+135 |
| | | | | |||||
* | | | | implement "continue" RainerScript statement | Rainer Gerhards | 2012-10-01 | 4 | -1/+10 |
| | | | | |||||
* | | | | bugfix: ruleset(){} directive errornously changed default ruleset | Rainer Gerhards | 2012-10-01 | 5 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset. | ||||
* | | | | preparing for 7.1.7 releasev7.1.7 | Rainer Gerhards | 2012-10-01 | 3 | -3/+3 |
| | | | | |||||
* | | | | implement RainerScript "call" statement | Rainer Gerhards | 2012-10-01 | 6 | -4/+70 |
| | | | | |||||
* | | | | doc: add SQL-template example | Tim Eifler | 2012-10-01 | 1 | -0/+29 |
| | | | | |||||
* | | | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 4 | -9/+26 |
| | | | | |||||
* | | | | cleanup | Rainer Gerhards | 2012-10-01 | 1 | -1/+0 |
| | | | | |||||
* | | | | refactor: unify nodetypes | Rainer Gerhards | 2012-10-01 | 2 | -14/+14 |
| | | | | |||||
* | | | | fix: invalid free in array-based string comparisons | Rainer Gerhards | 2012-10-01 | 1 | -3/+7 |
| | | | | |||||
* | | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 5 | -51/+170 |
| | | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-28 | 3 | -4/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | preparing for 7.1.6 releasev7.1.6 | Rainer Gerhards | 2012-09-28 | 3 | -3/+7 |
| | | | | | |||||
* | | | | | cleanup | Rainer Gerhards | 2012-09-28 | 2 | -9/+0 |
| | | | | | |||||
* | | | | | implement RainerScript array-based string comparison operations | Rainer Gerhards | 2012-09-28 | 2 | -13/+80 |
| | | | | | |||||
* | | | | | rainerscript: add basic plumbing for arrays | Rainer Gerhards | 2012-09-28 | 4 | -5/+94 |
|/ / / / | | | | | | | | | | | | | | | | | can be used in expressions, but always evaluate to the first element, only | ||||
* | | | | Implement RainerScript ruleset() statement | Rainer Gerhards | 2012-09-28 | 10 | -8/+77 |
| | | | | |||||
* | | | | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 3 | -3/+9 |
| | | | | |||||
* | | | | cleanup | Rainer Gerhards | 2012-09-28 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code | ||||
* | | | | fix screwed-up ChangeLog | Rainer Gerhards | 2012-09-28 | 1 | -12/+8 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-28 | 8 | -153/+578 |
|\| | | | |||||
| * | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-28 | 8 | -153/+578 |
| |\ \ \ | |||||
| | * | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | | |||||
| | * | | | imtcp: implement support for module() parameters | Rainer Gerhards | 2012-09-28 | 1 | -38/+135 |
| | | | | | |||||
| | * | | | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | | | | |||||
| | * | | | fix whitespace issue | Rainer Gerhards | 2012-09-27 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-27 | 14 | -241/+1181 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-27 | 16 | -244/+1173 |
| |\| | | | |||||
| | * | | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | | | |||||
| | * | | | cosmetic: remove irrelevant compiler warning | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | v7 does not even have this code any longer | ||||
| | * | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 4 | -28/+114 |
| | | | | | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| | * | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 2 | -9/+80 |
| | | | | | |||||
| | * | | | yet another nitfix... | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | nitfix | Rainer Gerhards | 2012-09-27 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | imfile: implement support for input() | Rainer Gerhards | 2012-09-27 | 1 | -3/+78 |
| | | | | | |||||
| | * | | | milestone: port imfile to v6 config system | Rainer Gerhards | 2012-09-26 | 2 | -149/+279 |
| | | | | | |||||
| | * | | | imrelp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+76 |
| | | | | |