Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| | * | imudp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -9/+84 |
| | | | |||||
| | * | imptcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 2 | -15/+119 |
| | | | |||||
| | * | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | |||||
| | * | imtcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+89 |
| | | | |||||
| | * | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | | |||||
| | * | Implement input() support in imuxsock | Rainer Gerhards | 2012-09-26 | 1 | -10/+119 |
| | | | |||||
| | * | Merge branch 'v6-stable' into v6-devel-input | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| | |\ | |||||
| | * | | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 5 | -1/+96 |
| | | | | |||||
| | * | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | | |||||
* | | | | preparing for 7.1.5v7.1.5 | Rainer Gerhards | 2012-09-26 | 3 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 3 | -1/+9 |
|\| | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 2 | -0/+9 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 2 | -0/+9 |
| | | | | |||||
| * | | | minor cleanup | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | | |||||
* | | | | fix invalid free in PoC == optimization | Rainer Gerhards | 2012-09-25 | 1 | -1/+3 |
| | | | | |||||
* | | | | slight optimization of == in string comparisons | Rainer Gerhards | 2012-09-25 | 1 | -9/+17 |
| | | | | |||||
* | | | | detect unreachable statements and emit warning message | Rainer Gerhards | 2012-09-25 | 1 | -0/+3 |
| | | | | |||||
* | | | | fix invalid state handling during action execution | Rainer Gerhards | 2012-09-25 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression. | ||||
* | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-25 | 4 | -5/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| * | | | | fix invalid free caused by optimized script execution | Rainer Gerhards | 2012-09-25 | 4 | -3/+7 |
| | | | | | |||||
| * | | | | Handle JSON value "null" instead of crashing | Miloslav Trmač | 2012-09-24 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Future json-c versions will handle this transparently, for now we have to do it manually. Signed-off-by: Miloslav Trmač <mitr@redhat.com> | ||||
* | | | | | cosmetic: remove no-longer valid TODO item | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | fix small memory leak during script optimization | Rainer Gerhards | 2012-09-25 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | fix optimizer-introduced memleak in action destruction | Rainer Gerhards | 2012-09-25 | 3 | -63/+66 |
| | | | | | |||||
* | | | | | Implement Script Optimizer: remove always-true PRIFILT | Rainer Gerhards | 2012-09-25 | 1 | -4/+44 |
| | | | | | |||||
* | | | | | cleanup & better debug output | Rainer Gerhards | 2012-09-24 | 3 | -33/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects | ||||
* | | | | | Clean up implementation of omdiscard-->STOP optimization | Rainer Gerhards | 2012-09-24 | 2 | -3/+13 |
| | | | | | |||||
* | | | | | PoC: optimize omdicard --> STOP | Rainer Gerhards | 2012-09-24 | 3 | -3/+23 |
|/ / / / | |||||
* | | | | doc: add recent changes to ChangeLog | Rainer Gerhards | 2012-09-24 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'milan/imkmsg' | Rainer Gerhards | 2012-09-24 | 7 | -0/+672 |
|\ \ \ \ | |||||
| * | | | | Documentation for new imkmsg module | Milan Bartos | 2012-09-24 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | new file: doc/imkmsg.html | ||||
| * | | | | Remove unnecessary config options in imkmsg | Milan Bartos | 2012-09-24 | 2 | -87/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | modified: plugins/imkmsg/imkmsg.c modified: plugins/imkmsg/kmsg.c | ||||
| * | | | | Made imkmsg parse the messages instead of creating string to be parsed later. | Milan Bartos | 2012-09-24 | 3 | -76/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: imkmsg.c modified: imkmsg.h modified: kmsg.c | ||||
| * | | | | Modified comments. | Milan Bartos | 2012-09-24 | 3 | -40/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: imkmsg.c modified: imkmsg.h modified: kmsg.c | ||||
| * | | | | Added new module, imkmsg, for structured kernel logs from /dev/kmsg. | Milan Bartos | 2012-09-24 | 6 | -0/+759 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still in development, bute ready to be commited to master. modified: Makefile.am modified: configure.ac new file: plugins/imkmsg/Makefile.am new file: plugins/imkmsg/imkmsg.c new file: plugins/imkmsg/imkmsg.h new file: plugins/imkmsg/kmsg.c | ||||
* | | | | | doc: Improve template system doc | Rainer Gerhards | 2012-09-24 | 1 | -51/+151 |
|/ / / / | |||||
* | | | | Fiddeling a bit with the template doc | Florian Riedl | 2012-09-24 | 1 | -60/+111 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' into master-newruleset | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
|\| | | |