Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+11 |
| | |||||
* | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 4 | -97/+24 |
| | |||||
* | milestone: convert imuxsock to ratelimitAddMsg() interface | Rainer Gerhards | 2012-10-15 | 1 | -30/+1 |
| | |||||
* | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 2 | -1/+7 |
|\ | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one. | ||||
| * | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| | | | |||||
* | | | imfile: converted to new ratelimit interface | Rainer Gerhards | 2012-10-15 | 1 | -15/+7 |
| | | | |||||
* | | | ratelimit: imtcp (and gssapi) converted to new interface | Rainer Gerhards | 2012-10-15 | 1 | -4/+3 |
| | | | |||||
* | | | imudp: add input batching & ratelimiter interface | Rainer Gerhards | 2012-10-15 | 2 | -6/+12 |
| | | | |||||
* | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 4 | -9/+12 |
| | | | |||||
* | | | indicate no original code left in imudp | Rainer Gerhards | 2012-10-15 | 1 | -2/+0 |
| | | | |||||
* | | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 6 | -7/+6 |
| | | | |||||
* | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 2 | -12/+12 |
| | | | |||||
* | | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 1 | -1/+13 |
| | | | |||||
* | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 7 | -10/+10 |
|/ / | | | | | | | no actual implementation yet done | ||||
* | | Merge branch 'beta' | Rainer Gerhards | 2012-10-04 | 2 | -6/+0 |
|\| | |||||
| * | 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. | ||||
* | | | | omlibdbi improvements | Rainer Gerhards | 2012-10-04 | 1 | -26/+125 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support for config load phases & module() parameters * support for default templates * driverdirectory is now cleanly a global parameter, but can no longer be specified as an action paramter. Note that in previous versions this parameter was ignored in all but the first action definition NOTE: more solid testing is needed for these changes. We spare this, as the module is scheduled for more work. This commit is more or less staging work. | ||||
* | | | 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 |