115 Commits

Author SHA1 Message Date
Rainer Gerhards
5e27f96554 Merge pull request #1527 from PascalWithopf/imtcpMaxFrame
imtcp: add parameter maxFrameSize
2017-04-26 12:21:01 +02:00
PascalWithopf
08c265d24d imtcp: add new parameter discardTruncatedMsg 2017-04-25 08:54:00 +02:00
PascalWithopf
01feb44bf1 imtcp: add parameter maxFrameSize 2017-04-20 12:58:57 +02:00
Rainer Gerhards
114605a0fc imtcp: fix very small (cosmetic) memory leak
For each listener, the name of an assigned ruleset is not freed. This
is cosmetic, because it is a very small static leak AND it needs to
be kept until end of run anyways (and at end of run the OS frees it).

However, the leak breaks memleak checks in the testbench.
2017-01-24 15:07:56 +01:00
Michael Biebl
6fbacdc41d typo fix: paramter → parameter
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772490
2015-06-08 20:23:01 +02:00
root
17d6f2aebb added 'address' attribte for address based bind to imtcp module 2015-03-25 10:23:18 +01:00
Rainer Gerhards
3652a332d3 imtcp: make framing fix configurable 2015-02-23 15:32:44 +01:00
Rainer Gerhards
49f5778920 bugfix imtcp: octet-counted framing cannot be turned off
closes https://github.com/rsyslog/rsyslog/issues/237
2015-01-30 14:31:16 +01:00
Reed Morrison
e301ed53d5 Adding options for tcp keep alive. 2014-12-13 18:15:51 +01:00
Rainer Gerhards
423c3ac62c pstats: add "origin" paramter to stats records
see also: https://github.com/rsyslog/rsyslog/issues/119
2014-11-19 15:49:09 +01:00
Rainer Gerhards
537a5aa90a undo commit 077d59c2c7984eb0273be949969585be241408c8 due to regression
There is a regression in this feature-add commit and I don't have the
time to search for it. Refering it back to contributor.

see also https://github.com/rsyslog/rsyslog/pull/145
2014-11-03 17:05:18 +01:00
Tomas Heinrich
077d59c2c7 imtcp: add options to configure keep-alive params
New options:        (legacy counterparts)
keepalive.time      $inputtcpserverkeepalive_time
keepalive.probes    $inputtcpserverkeepalive_probes
keepalive.interval  $inputtcpserverkeepalive_interval

The options are set separately for each instance.

This patch bumps the interface version of the nsd,
netstrm and tcpsrv modules.
2014-10-30 15:34:39 +01:00
Chris Hiszpanski
20d869968b Added LIBLOGGING_STDLOG_CFLAGS and LIBLOGGING_STDLOG_LIBS to automake sources
Build was failing when using these variables
2014-09-25 05:06:57 -07:00
Rainer Gerhards
8bcf3421e4 Merge branch 'v7-stable' 2013-10-28 11:45:56 +01:00
Rainer Gerhards
f7d79b8de1 bugfix: imtcp flowControl parameter incorrectly defaulted to "off"
This could cause message loss on systems under heavy load and was
a change-of-behaviour to previous version. This is a regression
most probably introduced in 5.9.0 (but did not try hard to find the
exact point of its introduction).
2013-10-28 11:45:09 +01:00
Rainer Gerhards
33bb5517ba imtcp: add streamdriver.name module parameter
permits overriding the system default stream driver (gtls, ptcp)
2013-09-17 15:01:30 +02:00
Rainer Gerhards
d11e8221a8 milestone: defaultTZ can be set in msg obj (via imtcp)
... but parser does not yet use it.
2013-08-30 18:29:46 +02:00
Rainer Gerhards
a5abbddb5c bugfix: imtcp addtlframedelimiter could not be set to zero
Thanks to Chris Norton for alerting us.
2013-08-26 18:41:59 +02:00
Rainer Gerhards
2cd686d555 imtcp: permit parameter name with typo for backward compatibility 2013-06-25 09:47:56 +02:00
Michael Biebl
a73caef0b8 imtcp: fix typo in config parameter name 2013-06-25 09:45:32 +02:00
Rainer Gerhards
1b1fb636f7 bugfix: small, mostly static memory leak in imtcp
This had no practical effect, a handful of bytes was lost
at most, no matter how many messages were processed (leak
in config processor).
2012-12-14 12:44:49 +01:00
Rainer Gerhards
8c32e9d36f Merge branch 'v7-stable' 2012-11-02 19:05:27 +01:00
Rainer Gerhards
a3742bdffd bugfix: potential abort of imtcp on rsyslogd shutdown 2012-11-02 19:05:05 +01:00
Rainer Gerhards
0dc56f1426 imtcp: support for Linux-Type ratelimiting added 2012-10-15 19:01:05 +02:00
Rainer Gerhards
0d60901e6e ratelimit: imtcp (and gssapi) converted to new interface 2012-10-15 12:09:37 +02:00
Rainer Gerhards
11c203c673 implement imtcp "permittedPeers" module-global parameter 2012-10-01 12:00:52 +02:00
Rainer Gerhards
43da91636a imtcp: implement support for module() parameters 2012-09-28 08:09:47 +02:00
Rainer Gerhards
7366f115ae imptcp: implement support for input() 2012-09-26 16:08:19 +02:00
Rainer Gerhards
da01473c60 imtcp: implement support for input() 2012-09-26 15:21:59 +02:00
Rainer Gerhards
7348da7e02 bugfix: imtcp could abort on exit due to invalid free() 2012-08-28 19:07:58 +02:00
Rainer Gerhards
bf85d81790 implemented freeCnf() module interface & fixed some mem leaks
The interface was actually not present in older versions, even though some modules
already used it. The implementation was now done, and not in 6.3/6.4
because the resulting memory leak was ultra-slim and the new interface
handling has some potential to seriously break things. Not the kind of
 thing you want to add in late beta state, if avoidable.
2012-06-25 12:35:46 +02:00
Rainer Gerhards
d6da57ae03 Merge branch 'v5-stable-newstats'
Conflicts:
	action.c
	configure.ac
	doc/imuxsock.html
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c
	runtime/ruleset.c
	tcpsrv.h
	tools/syslogd.c
2012-04-07 15:42:46 +02:00
Rainer Gerhards
4fb7ba113c added configuration directive to disable octet-counted framing
... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
2012-03-19 15:28:25 +01:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master
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
2012-01-19 13:07:46 +01:00
Rainer Gerhards
9b24152b6a undoing v6.1 config scoping interface, part I
The most common files are now changed, more needs to be done.
2012-01-18 18:21:08 +01:00
Rainer Gerhards
ac9afc4149 Merge branch 'v5-stable' into master
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
2012-01-18 14:08:24 +01:00
Rainer Gerhards
fe4cfa6d1f Merge branch 'v5-stable' into v6-stable
Conflicts:
	plugins/imtcp/imtcp.c
2012-01-14 18:35:09 +01:00
Rainer Gerhards
0871d0a077 Merge branch 'v4-stable' into v5-stable
Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c
2012-01-14 18:32:40 +01:00
Rainer Gerhards
ca39d8e60e more files moved to ASL 2.0 2012-01-12 03:29:19 +01:00
Rainer Gerhards
f8342ced6f - imudp&imtcp now report error if no listener at all was defined
Thanks to Marcin for suggesting this error message
2011-08-05 14:56:20 +02:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
8488d8c3c1 Merge branch 'v5-devel'
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
2011-06-27 12:33:26 +02:00
Rainer Gerhards
6625a8790d added capability for imtcp to activate keep-alive packets
at the socket layer.
reference: http://kb.monitorware.com/post20791.html
2011-05-09 10:07:23 +02:00
Rainer Gerhards
759904862d step: imtcp did not properly handle privilege drop 2011-05-06 10:30:10 +02:00
Rainer Gerhards
ff2bb192f2 step: conf interface now natively supports priv drop 2011-05-06 10:06:32 +02:00
Rainer Gerhards
b056c258d7 step: generalized new config interface for all module types 2011-05-06 08:43:15 +02:00
Rainer Gerhards
c0d1334f6e step: imtcp moved to new config interface
as far as we know that new interface right now ;)
2011-05-05 11:36:05 +02:00
Rainer Gerhards
d0d9f823b7 step: put plumbing in place for new input module config system 2011-05-03 18:02:18 +02:00
Rainer Gerhards
b722cd3fe6 milestone: ruleset now supports rsconf_t 2011-04-19 12:18:26 +02:00
Rainer Gerhards
92a782dd2f Merge branch 'v5-devel'
Conflicts:
	configure.ac
	doc/manual.html
	plugins/imtcp/imtcp.c
2011-04-12 11:48:09 +02:00