53 Commits

Author SHA1 Message Date
Rainer Gerhards
ca0ddc30a3 completed multi-ruleset core support
... as well as added multi-ruleset support for imtcp
2009-06-12 15:31:08 +02:00
Rainer Gerhards
a900a7c34b greatly enhanced testbench
The imdiag module now can very effectively inject messages, which also
frees us from uncertainties of tcp reception and processing. All shell
script based tests have been modularized, what makes it far easier to
create new tests. Also, the test bench now executes more reliable and
much faster, because we can now rely on actual engine information where
we previously did just a dumb sleep.
2009-05-27 11:29:47 +02:00
Rainer Gerhards
aba90e8248 added capability to run multiple tcp listeners (on different ports)
Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
2009-05-22 17:06:52 +02:00
Rainer Gerhards
a5b4cb1681 Merge branch 'beta'
Conflicts:
	ChangeLog
	tcpsrv.c
	tcpsrv.h

Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.
2009-04-09 13:44:52 +02:00
Rainer Gerhards
0cade5118f Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
2009-04-09 13:41:38 +02:00
Rainer Gerhards
bc471f1d90 bugfix: $InputTCPMaxSessions config directive was accepted, but not honored
This resulted in a fixed upper limit of 200 connections.
2009-04-09 13:36:44 +02:00
Rainer Gerhards
924ceb305d Merge branch 'beta'
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
2009-02-24 14:52:49 +01:00
Michael Biebl
1448e2486e make all cflags and libs variables uppercase
pkg-config uses uppercase for its _CFLAGS and _LIBS variable names.
So we follow suit and convert all _cflags and _libs variables to
uppercase for more consistency.
2009-02-24 13:09:44 +01:00
Rainer Gerhards
4879952995 minor cleanup 2008-11-29 07:48:24 +01:00
Rainer Gerhards
f0ddbed44c security bugfix: $AllowedSender was not honored,
...all senders were permitted instead
2008-11-29 07:22:48 +01:00
Rainer Gerhards
3f6c73a8b7 added (internal) error codes to error messages
Also added redirector to web description of error codes
closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
2008-06-27 12:52:45 +02:00
Rainer Gerhards
75063e54b2 bugfix: gtls und ptcp netstream driver communicated invalid iRet
This was introduced due to recent interface change.
2008-06-24 18:27:52 +02:00
Rainer Gerhards
7b1a570d54 changed Rcv-Interface in tcpsrv subsystem
It is now iRet based. This enables us to communicate
more in-depth information to the upper peers. This is needed
to handle the EGAIN case on rcv (not yet implemented)
2008-06-23 10:29:15 +02:00
Michael Biebl
b6b53972e1 Remove .cvsignore files, add .gitignore.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-06-11 17:03:47 +02:00
Rainer Gerhards
99e97dadf1 bugfix: removed some memory leaks in TLS code 2008-06-04 09:37:10 +02:00
Rainer Gerhards
85b587f93d first implementation of TLS server client authentication check
The TLS server now checks the client fingerprint. This works, but
is highly experimental. Needs to be refined for practice. Also:
- implemented permittedPeers helper construct to store names
- changed omfwd implementation to use new permittedPeers
2008-05-19 18:52:44 +02:00
varmojfekoj
d2b63414ef fixed potential segfault due to invalid call to cfsysline
thanks to varmojfekoj for the patch

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-05-14 08:32:40 +02:00
Rainer Gerhards
da88900143 added $InputTCPServerStreamDriverMode config directive 2008-04-30 18:53:21 +02:00
Rainer Gerhards
b0d63ea8f2 made plain tcp syslog via TLS work on the server
... but so far only in blocking mode
2008-04-30 14:51:45 +02:00
Rainer Gerhards
055d4ffc2a fixed problem with module unload sequence 2008-04-29 15:36:22 +02:00
Rainer Gerhards
721b9ee252 client functionality works again (with the new socket abstraction) 2008-04-23 17:48:13 +02:00
Rainer Gerhards
1892fc75f9 added new netstrms class
netstrms is at the top layer of the socket abstraction
2008-04-23 15:07:19 +02:00
Rainer Gerhards
d9b0c77d3e some more cleanup
reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear
2008-04-16 15:27:53 +02:00
Rainer Gerhards
d7f33053da made everything compile with the new runtime subdirectory 2008-04-16 08:42:00 +02:00
Rainer Gerhards
17f36a76cb bugfix: imgssapi segfaulted under some conditions; this fix is actually not
just a fix but a change in the object model. Thanks to varmojfekoj for
    providing the bug report, an initial fix and lots of good discussion
    that lead to where we finally ended up.
2008-03-13 11:04:33 +00:00
Rainer Gerhards
618a7f6a22 changed omgssapi and omfwd to utilize new object calling interface; made a
tcpclt class; (stage work, among others, for more intelligent recovery
    from TCP session recovery)
2008-03-12 14:08:21 +00:00
Rainer Gerhards
e946e122d0 implemented module unload handling (required a number of interface changes) 2008-03-11 16:43:13 +00:00
Rainer Gerhards
4db62823e7 renamed library module file names to lm*, so that they match the overall
scheme (like im* and om*)
2008-03-07 17:26:58 +00:00
Rainer Gerhards
fa67273c16 - added RSYSLOGD_MODDIR environment variable
- added -M rsyslogd option (allows to specify module directory location)
- converted net.c into a loadable library plugin
2008-03-07 08:06:16 +00:00
Rainer Gerhards
3d10231150 cleanup by Michael Biebl 2008-03-06 10:21:37 +00:00
Rainer Gerhards
28dcc746bd applied patch from Michael Biebl to clean up build system 2008-03-06 07:39:32 +00:00
Rainer Gerhards
f9105d5141 changed module loader to automatically add ".so" suffix if not specified
(over time, this shall also ease portability of config files)
2008-03-05 16:55:13 +00:00
Rainer Gerhards
545346e697 - changed modules.c calling conventions to be interface-based
- moved module loader from conf.c to module.c, where it belongs
- made the necessary plumbing to auto-load library modules
- upgraded debug system to include iRet in function exit message
- changed module interface so that instances need only to be supported by
    output plugins (if we actually need them for input plugins, we can
    always add it again...)
- milestone: first implementation of library modules (but do not get
    unloaded on exit/hup so far)
2008-03-05 10:30:06 +00:00
Rainer Gerhards
bc7d8ccebb - changed module interface to support querying obj interface (stage work)
- changed module interface version, as the interface change is quite large
2008-03-04 10:27:45 +00:00
Rainer Gerhards
cb71628f67 fixed newly introduced bugs in imgssapi and imtcp and their helpers now
plain tcp works again
2008-03-03 12:40:04 +00:00
Rainer Gerhards
4273036019 made imgssapi compile 2008-03-03 09:04:59 +00:00
Rainer Gerhards
9d8eb28ebd - added class tcps
- added class tcps_sess
- changed imtcp to use new classes; seems to work; imgssapi currently
    broken
2008-03-02 10:19:25 +00:00
Rainer Gerhards
3467a10c06 shuffled some more code, added comments varmojfekoj sent me a while ago to
imgssapi
2008-02-26 11:16:05 +00:00
Rainer Gerhards
b98ca5114e split off imgssapi from imtcp, but still with a lot of dependency 2008-02-26 11:02:27 +00:00
Rainer Gerhards
01ceb6d799 declared some things in imtcp.c static so that they don't conflict if
loaded as imtcp and imgssapi
2008-02-26 09:43:18 +00:00
Rainer Gerhards
d839bc3fa3 applied Michael Biebl's fix for building rsyslog core without gssapi
support
2008-02-26 08:04:34 +00:00
Rainer Gerhards
8fdd3b45c0 added some doc for imgssapi and imtcp input modules 2008-02-22 09:13:14 +00:00
Rainer Gerhards
51bb02e3cd applied patch by varmojfekoj to allow gssapi functionality to be build as a
separate plugin (so that gssapi and plain tcp functionality can be
    individually distributed). Also inclulded some other enhancements, most
    importantly initial compatibility mode system
2008-02-22 07:24:15 +00:00
Rainer Gerhards
2c5712f6ac integrated patch from Peter Vrabec to change the build process to produce
imtcp.so and imgssapi.so from imtcp.c (in support of new gassapi input
    module) - many thanks, Peter!
2008-02-22 07:04:03 +00:00
Rainer Gerhards
28c44e9a7b - fixed a bug that caused a segfault on startup when no $WorkDir directive
was specified in rsyslog.conf
- fixed a bug that caused a segfault on queues with types other than "disk"
- removed the now longer needed thread TermSyncTool
2008-01-10 14:27:26 +00:00
Rainer Gerhards
e27555c468 added --enable-mudflap ./configure option 2008-01-08 16:13:42 +00:00
Rainer Gerhards
fc761b9fdc applied Michael Biebl's patch to clean up the makefiles 2008-01-03 14:08:58 +00:00
Rainer Gerhards
bcdb6dcfd7 internal restructuring in omfwd.c - stage work for further modularization I
think I also fixed a bug as a side-effect - but not looked to much at
    it
2007-12-27 17:32:10 +00:00
Rainer Gerhards
94af628fbd removed active INET code from syslogd.c - still some auxiliary things
remain
2007-12-26 17:21:02 +00:00
Rainer Gerhards
483be40471 enhanced imtcp, among others to handel invalid NetScreen framing
- added $InputTCPServerAddtlFrameDelimiter config directive, which
  enabeles to specify an additional, non-standard message delimiter
  for processing plain tcp syslog. This is primarily a fix for the invalid
  framing used in Juniper's NetScreen products. Credit to forum user
  Arv for suggesting this solution.
- added $InputTCPServerInputName property, which enables a name to be
  specified that will be available during message processing in the
  inputname property. This is considered useful for logic that treats
  messages differently depending on which input received them.
2008-12-10 14:26:19 +01:00