Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | imrelp: properly initialize certifcate parameters | Rainer Gerhards | 2013-06-25 | 1 | -0/+3 |
| | |||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 1 | -2/+0 |
|\ | |||||
| * | imfile: remove redundant error mesage | Rainer Gerhards | 2013-06-25 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 3 | -4/+5 |
|\| | |||||
| * | typo fix ("listner" vs. "listener") | Michael Biebl | 2013-06-25 | 2 | -2/+2 |
| | | |||||
| * | imtcp: permit parameter name with typo for backward compatibility | Rainer Gerhards | 2013-06-25 | 1 | -1/+3 |
| | | |||||
| * | imtcp: fix typo in config parameter name | Michael Biebl | 2013-06-25 | 1 | -2/+2 |
| | | |||||
| * | bugfix: potential segfault on rsyslog termination in imudp | Rainer Gerhards | 2013-06-25 | 1 | -1/+0 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456 | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 3 | -9/+3 |
|\| | |||||
| * | bugfix: RainerScript object required parameters were not properly checked | Rainer Gerhards | 2013-06-24 | 2 | -8/+2 |
| | | | | | | | | this clould result to segfaults on startup if parameters were missing. | ||||
| * | bugfix: omrelp "template" parameter is NOT required | Rainer Gerhards | 2013-06-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 1 | -0/+4 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | impstats: solve build problem on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -0/+4 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458 | ||||
* | | mmfields: add "jsonRoot" parameter | Rainer Gerhards | 2013-06-24 | 1 | -3/+12 |
| | | |||||
* | | omrelp: add tls.authmode parameter | Rainer Gerhards | 2013-06-21 | 1 | -0/+12 |
| | | |||||
* | | omrelp: add tls.authmode parameter | Rainer Gerhards | 2013-06-21 | 1 | -0/+12 |
| | | |||||
* | | omrelp: disable action on auth failure | Rainer Gerhards | 2013-06-21 | 1 | -6/+11 |
| | | | | | | | | For almost all cases, it makes no sense to try to reconnect. | ||||
* | | omrelp: emit error message on peer authentication failure | Rainer Gerhards | 2013-06-21 | 2 | -2/+12 |
| | | |||||
* | | imrelp: emit error message on authentication error | Rainer Gerhards | 2013-06-20 | 1 | -0/+9 |
| | | |||||
* | | minor cleanup | Rainer Gerhards | 2013-06-20 | 1 | -5/+0 |
| | | |||||
* | | omrelp: add permittedPeer handling (authorization) | Rainer Gerhards | 2013-06-20 | 1 | -1/+24 |
| | | |||||
* | | Added support for command line parameters in "binary" config setting of omprog. | Andre Lorbach | 2013-06-18 | 1 | -16/+113 |
| | | | | | | | | | | | | | | - Command line Parameter Support is only available with the new config format, here is a sample: action(type="omprog" binary="/path/omprog.py --option=value --option2=\"value 2\"") - Also fixed a seqfault wenn using the new config format and no template parameter was specified. | ||||
* | | imrelp: support for setting permitted peers (client authentication) added | Rainer Gerhards | 2013-06-18 | 1 | -1/+23 |
| | | |||||
* | | imrelp: add support for impstats | Rainer Gerhards | 2013-06-18 | 1 | -1/+30 |
| | | |||||
* | | imrelp: switch to newer-style librelp interface | Rainer Gerhards | 2013-06-18 | 1 | -2/+4 |
| | | | | | | | | | | | | | | This interface permits us to pass a user-pointer to librelp, which it will pass back to us on message reception. This is the foundation for some more advanced features that require access to imrelp's configration object. | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | imjournal: rate limiter was destructed too early | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
| | | | | | | | | | | Too quick hacking, obviously, one too late, one too early, now it should fit ;) Thanks to Tomas Heinrich for pointing this out. | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -1/+4 |
|\| | |||||
| * | imjournal fix: put ratelimiter destruction in wrong entry point | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
| | | | | | | | | No regression, this was in recently written, never-released code. | ||||
| * | implement new ratelimiting mode for imjournal | Rainer Gerhards | 2013-06-17 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | and make imjournal use it. The new mode is needed, as imjournal uses journal's timestamp as message generation time (which otherwise is when the message entered the system, and the ratelimiter uses this as current timestamp in order to save performance). It is debatable if imjournal is doing the right thing here. But it doesn't feel totally wrong. So let's safe that debate for later ;) | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -5/+31 |
|\| | |||||
| * | Add IgnorePreviousMessages option to imjournal. | Milan Bartos | 2013-06-17 | 1 | -5/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This option specifies whether imjournal should ignore messages that are currently in journal. This option is only used when there is no StateFile to avoid message loss. modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c Conflicts: doc/imjournal.html plugins/imjournal/imjournal.c | ||||
| * | Merge branch 'tmp' into v7-stable | Rainer Gerhards | 2013-06-17 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| | * | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
* | | | Merge branch 'tmp' | Rainer Gerhards | 2013-06-17 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| * | | | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 1 | -3/+3 |
| | |/ | |/| | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -0/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | imjournal: add legacy config statement for ratelimiting | Rainer Gerhards | 2013-06-15 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -8/+23 |
|\| | | |||||
| * | | imjournal: add ratelimiting capability | Rainer Gerhards | 2013-06-15 | 1 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original imjournal code did not support ratelimiting at all. We now have our own ratelimiter. This can mitigate against journal database corruption, when the journal re-sends old data. This is a current bug in systemd journal, but we won't outrule this to happen in the future again. So it is better to have a safeguard in place. By default, we permit 20,000 messages witin 10 minutes. This may be a bit restrictive, but given the risk potential it seems reasonable. Users requiring larger traffic flows can always adjust the value. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -12/+31 |
|\| | | |||||
| * | | bugfix: prevent a segfault if state file is not defined | Tomas Heinrich | 2013-06-14 | 1 | -12/+31 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2013-06-14 | 1 | -1/+0 |
| | | | |||||
* | | | [io]mrelp: support for certificate parameters | Rainer Gerhards | 2013-06-13 | 2 | -0/+46 |
| | | | |||||
* | | | omrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 2 | -1/+10 |
| | | | |||||
* | | | imrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 1 | -0/+6 |
| | | | |||||
* | | | imrelp: new parameter "compression.dhbits" | Rainer Gerhards | 2013-06-12 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation | ||||
* | | | Merge branch 'master-tcp-compress-stream' | Rainer Gerhards | 2013-06-12 | 1 | -12/+167 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into master-tcp-compress-stream | Rainer Gerhards | 2013-05-07 | 6 | -43/+658 |
| |\ \ \ | |||||
| * | | | | tcp strm compression: add stats counters | Rainer Gerhards | 2013-04-18 | 1 | -5/+23 |
| | | | | |