summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'beta'Rainer Gerhards2012-06-151-12/+2
|\| | | | |
| * | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-151-12/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c tools/syslogd.c
| | * \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-151-13/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | bugfix: randomized IP option header in omudpspoof caused problemsRainer Gerhards2012-06-151-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch.
| | * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-011-0/+11
| | |\| | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-141-1/+2
|\| | | | | |
| * | | | | | bugfix: small memory leak in imptcp (static after config read)Rainer Gerhards2012-06-141-1/+2
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-06-061-15/+0
|\| | | | | |
| * | | | | | Remove obsolete ommongodb build instructionsMiloslav Trmač2012-06-051-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin now uses libmongo-client (which is configured using pkg-config) instead of the 10gen client, so the instructions to copy client source code no longer apply.
* | | | | | | Merge branch 'master-zmq'Rainer Gerhards2012-06-017-1/+1190
|\ \ \ \ \ \ \
| * | | | | | | Minor updatesDavid Kelly2012-06-014-75/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * C++ style comments converted to c-style * copy/paste error (benign I believe) in omzmq3 fixed * added readme files for both imzmq3 and omzmq3
| * | | | | | | added new-style zeromq plugins, based on czmq api and rsyslog v6 confDavid Kelly2012-05-295-1/+1137
| | | | | | | |
* | | | | | | | imrelp now supports non-cancel thread terminationRainer Gerhards2012-05-311-3/+36
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | (but now requires at least librelp 1.0.1)
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-05-291-0/+2
|\| | | | | |
| * | | | | | bugfix: invalid free in imptcp could lead to abort during startupRainer Gerhards2012-05-291-0/+2
| | | | | | |
* | | | | | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-291-10/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This actually at compile time disables a lot of debug code, resulting in some speedup (but serious loss of debugging capabilities)
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-291-0/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-291-0/+11
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | bugfix/omudpspoof: problems, including abort, happend when run on multiple ↵Rainer Gerhards2012-05-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads. Root cause is that libnet is not thread-safe. Omudpspoof now guards libnet calls with their own mutex.
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-1/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-191-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-031-1/+19
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-1/+19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-031-1/+11
| | | | | | |
| | * | | | | bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-191-2/+2
| |\| | | | |
| | * | | | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-10/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-232-4/+1
| | | | | | |
* | | | | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-231-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-161-0/+1
| | | | | |
* | | | | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-161-2/+2
| | | | | |
* | | | | | make "old" omelasticsearch compileRainer Gerhards2012-04-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this module is to be replaced by branch currently in development. But I want to be able to compile the previous one, at least ;)
* | | | | | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
| | | | | |
* | | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-6/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-8/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-8/+7
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * | | imuxsock: do not cache hostnameRainer Gerhards2012-04-121-10/+4
| | | | | |
* | | | | | imuxsock: fixed regression from last mergeRainer Gerhards2012-04-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | thanks to Brian Knox for alerting me and the initial analysis
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-073-56/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-201-2/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c
| * \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-193-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| * \ \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-143-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-124-8/+62
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
| * \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-021-2/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-014-47/+49
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | | | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313