summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* abandon imttcp, concept failed, explanation comment added to moduleRainer Gerhards2011-01-241-0/+53
| | | | | but will leave the module inside source tree as it may be useful for further testing ... maybe... ;)
* thread leak fixed (but not in a clean way)Rainer Gerhards2011-01-241-2/+10
|
* added first (very experimental) version of imttcpRainer Gerhards2011-01-242-0/+1089
|
* Merge branch 'v5-devel'Rainer Gerhards2010-12-174-7/+59
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
| * Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-172-4/+56
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
| | * added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settingsRainer Gerhards2010-12-171-0/+42
| | |
| | * Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-161-3/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c
| | * | Fix a potential missing '\0' on too long strings.Luis Fernando Muñoz Mejías2010-11-301-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By implementing a trivial strlcpy it's much easier to detect string truncations and react to them. This also gives a noticeable speedup in buffer handling (can be HUGE), since strlcpy() doesn't clear all the buffer entry before writing data. Converted all uses of strncpy() into strlcpy(). Also, we don't need to check for some null pointers, as there are no malloc-like operations in the doAction loop.
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-172-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * \ \ Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-161-3/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| | | * | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-161-3/+1
| | | | |
| | * | | bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
* | | | | Merge branch 'lognorm' + some doc addedRainer Gerhards2010-12-132-0/+281
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | milestone: added support for CEE-properties in property-based filtersRainer Gerhards2010-12-011-3/+3
| | | | | |
| * | | | | milestone: template supports CEE output via %$!all-json%Rainer Gerhards2010-12-011-1/+1
| | | | | |
| * | | | | mmnormalize loads & runs (basic testing done)Rainer Gerhards2010-12-012-2/+14
| | | | | |
| * | | | | milestone: added mmnormalize (compiles, but untested)Rainer Gerhards2010-12-012-0/+269
|/ / / / /
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-11-252-1/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-252-1/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h
| | * | | streamlined epoll_create() code a little bitRainer Gerhards2010-11-251-2/+5
| | | | |
| | * | | fixed compile problem in imptcp if no epoll_create1() is presentDavid Hill2010-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | Merge branch 'v5.6.0a' into v5-stableRainer Gerhards2010-11-251-3/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | | * | | imfile improvementsRainer Gerhards2010-10-271-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| | * | | | provide clear error message if platform does not support imptcpRainer Gerhards2010-11-051-0/+7
| | | | | |
| | * | | | permitted imptcp to work on systems which support epoll(), but not ↵Rainer Gerhards2010-11-051-1/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epoll_create(). Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204 Thanks to Nicholas Brink for reporting this problem.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-201-3/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | | | Merge branch 'v4-devel' into v5-develroot2010-10-201-3/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | imfile improvementsRainer Gerhards2010-10-241-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-191-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-221-3/+3
|\| | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-10-221-3/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-191-3/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
| | | * | fixing some compile problems on FreeBSDRainer Gerhards2010-10-191-3/+3
| | | | |
| | * | | solved minor compile problem (caused by merge)Rainer Gerhards2010-10-151-1/+0
| | | | |
| | * | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-153-1/+1185
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| | | * | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-151-1/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/stream.c
| | | | * fixed incomplete mergeRainer Gerhards2010-10-151-0/+1
| | | | |
| | | | * imfile: bugfixes in regard to large files (> 2GB)Rainer Gerhards2010-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: a couple of problems that imfile had on some platforms, namely Ubuntu (not their fault, but occured there) - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!)
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-152-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | imfile: bug fixesRainer Gerhards2010-10-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | either one or two bugs fixed ;) Definitely a problem where no state file is written when working with relative pathes. Also, some problems with offsets should be fixed for very large files. However, I could not yet experimentally show the issue so it probably needs more verification.
| * | | | removed need for math libraryRainer Gerhards2010-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by doing math a little bit more optimal in hash table code. Also reduced memory requirement for imuxsock hash tables (expected number of connections was set too high -- table can be extended dynamically).
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-061-3/+15
|\| | | |
| * | | | previous bugfix was incomplete, resolving thisRainer Gerhards2010-10-061-0/+4
| | | | |
| * | | | bugfix/imuxsock: did not compile on platforms without SCM_CREDENTIALSRainer Gerhards2010-10-061-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: we do rate-limiting by the pid and we obtain the pid via SCM_CREDENTIALS socket options. So this patch effectively disables the (new) ratelimiting capability. In a later patch, I'll see that I can provide a global ratelimiting capability, which could always be used (an alternative may be using the tag, will check this out as well).
* | | | | omhdfs: fixed some issues with new config interface functionsRainer Gerhards2010-10-051-20/+31
| | | | | | | | | | | | | | | | | | | | also did some cleanup in omfile.c
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-056-112/+1247
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
| * | | | Merge branch 'v5-devel-hdfs' into v5-develRainer Gerhards2010-10-053-2/+483
| |\ \ \ \
| | * | | | omhdfs: added ability to create non-existing directories in name pathRainer Gerhards2010-10-041-56/+72
| | | | | |
| | * | | | omhdfs: fixed some issues with previous commitRainer Gerhards2010-10-041-12/+12
| | | | | |
| | * | | | omhdfs: support for HUP addedRainer Gerhards2010-10-041-9/+33
| | | | | |