summaryrefslogtreecommitdiffstats
path: root/plugins/imptcp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-12/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-181-8/+8
| | | | | | | | The most common files are now changed, more needs to be done.
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-17/+16
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
* | \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-16/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-181-15/+41
| |\ \ \
| | * | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| | | | |
| | * | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| | | |/ | | |/|
| * | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-171-17/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
* | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-17/+17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * | | licensing updateRainer Gerhards2012-01-161-17/+16
| | | |
* | | | milestone: added module config namesRainer Gerhards2011-07-201-0/+1
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-4/+109
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | added support to control KEEPALIVE settings in imptcpRainer Gerhards2011-05-131-2/+66
| | | | | | | | | | | | | | | | this has not yet been added to imtcp, but could be done on request
| * | | imptcp: added capability to activate keep-alive at socket layerRainer Gerhards2011-05-111-4/+37
| |/ /
* | | step: imklog (linux) moved to v2 config systemRainer Gerhards2011-05-251-1/+0
| | |
* | | step: imptcp ported to v2 config systemRainer Gerhards2011-05-231-70/+182
| | |
* | | step: imtcp moved to new config interfaceRainer Gerhards2011-05-051-2/+2
| | | | | | | | | | | | as far as we know that new interface right now ;)
* | | step: put plumbing in place for new input module config systemRainer Gerhards2011-05-031-0/+30
| | |
* | | milestone: ruleset now supports rsconf_tRainer Gerhards2011-04-191-1/+1
| |/ |/|
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-141-5/+8
|\| | | | | | | | | Conflicts: tests/diag.sh
| * fixed compile problem from epoll_create patchRainer Gerhards2011-03-141-1/+1
| |
| * Fall back to epoll_create() if epoll_create1() is not availableMichael Biebl2011-03-141-5/+8
| | | | | | | | | | | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996
* | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-231-0/+1
| | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | fixed some regressions in imptcpRainer Gerhards2011-02-011-2/+11
| | | | | | | | from new changes, so far unreleased versions
* | cleanup of imptcp; doc added; config statement for workers addedRainer Gerhards2011-01-311-23/+17
| |
* | added multi-threading support to imptcpRainer Gerhards2011-01-281-47/+182
| |
* | small speedup to imptcp: read more than one events in epoll callRainer Gerhards2011-01-281-1/+2
| |
* | imptcp now supports non-cancel termination mode, a plus in stabilityRainer Gerhards2011-01-281-15/+13
| |
* | Merge branch 'v5-devel'Rainer Gerhards2010-11-251-1/+19
|\| | | | | | | | | Conflicts: 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>
| * 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.
| * solved minor compile problem (caused by merge)Rainer Gerhards2010-10-151-1/+0
| |
* | Merge branch 'v5-devel'Rainer Gerhards2010-08-111-10/+17
|\ \
| * | Merge branch 'v4-devel' into v5-develRainer Gerhards2010-08-111-10/+17
| |\|
| | * imptcp: added $InputPTCPServerAddtlFrameDelimiter directiveRainer Gerhards2010-08-111-5/+8
| | | | | | | | | | | | also improved testbench
| | * fixed minor issue: imptcp did a close(-1) on each acceptRainer Gerhards2010-08-111-1/+2
| | |
| | * imptcp: added $InputPTCPServerNotifyOnConnectionClose directiveRainer Gerhards2010-08-111-5/+8
| | | | | | | | | | | | plus some minor cleanup
* | | Merge branch 'master' into tmpRainer Gerhards2010-08-111-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h also updated omuxsock and imptcp to new interfaces
* / fix required for new engineRainer Gerhards2010-08-111-1/+0
|/
* some cleanup and minor optimizationRainer Gerhards2010-08-101-33/+32
|
* added tests for imptcp and fixed some problems with itRainer Gerhards2010-08-101-18/+41
| | | | it now also works reliably in edge-triggered mode
* added imptcpRainer Gerhards2010-08-102-0/+1152
imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)