Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | re-delete cust1.c plugin dummy file | Rainer Gerhards | 2012-10-04 | 1 | -0/+0 |
| | | | | This is no longer needed. | ||||
* | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
|\ | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| |\ | |||||
| | * | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. | ||||
* | | | get rid of compiler warning | Rainer Gerhards | 2012-10-02 | 1 | -4/+0 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -3/+0 |
| | | | |||||
* | | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 1 | -4/+20 |
| | | | |||||
* | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 1 | -18/+35 |
| | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 2 | -2/+6 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-28 | 3 | -46/+205 |
|\ \ \ | |||||
| * | | | 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 | 6 | -207/+908 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c | ||||
| * | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| * | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 1 | -9/+77 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | imtcp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+89 |
| | | | | |||||
| * | | | 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 | 1 | -0/+7 |
| |\| | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-26 | 1 | -0/+7 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c | ||||
| | | * | enable DNS resolution in imrelp | Apollon Oikonomopoulos | 2012-09-26 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -0/+0 |
| | | | | |||||
| * | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail. | ||||
* | | | | 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> | ||||
* | | | | 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 | 4 | -0/+741 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | bugfix: small memory leak in imdiag | Rainer Gerhards | 2012-09-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail. | ||||
* | | | | preparing for 7.1.4 releasev7.1.4 | Rainer Gerhards | 2012-09-19 | 2 | -5/+5 |
| | | | | |||||
* | | | | new ruleengine: implement template type "subtree" | Rainer Gerhards | 2012-09-18 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: grammar/grammar.y grammar/lexer.l | ||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-12 | 1 | -8/+6 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-12 | 1 | -5/+5 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | * | remove unused variables (if SCM_CREDENTIALS is not available) | Cristian Ionescu-Idbohrn | 2012-09-12 | 1 | -1/+5 |
| | | | | |||||
| | | * | 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.) | ||||
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-11 | 1 | -3/+1 |
| |\ \ \ | | | |/ | | |/| |