40 Commits

Author SHA1 Message Date
Rainer Gerhards
5416a94bbe added tcp output rebinding option.
needs some more testing and doc
2009-07-14 18:57:49 +02:00
Rainer Gerhards
76b3fb7960 Merge branch 'beta' 2009-07-13 15:58:30 +02:00
Rainer Gerhards
47ca77faca Merge branch 'v3-stable' into v4-beta
Conflicts:
	ChangeLog
2009-07-13 15:52:45 +02:00
Rainer Gerhards
ef9722ec87 fix compile error in zip sender patch
... at least I was smart enough to remind me that I did not do
one test ;) That reminder was the compiler error. Now removed and
test done ;) [simple things tend to work, lol]
2009-07-13 15:44:09 +02:00
Rainer Gerhards
89e18de662 bugfix: sending syslog messages with zip compression did not work 2009-07-13 14:24:16 +02:00
Rainer Gerhards
92020c6ea1 bugfix: omfwd segfault when debugging is turned on 2009-07-09 12:34:48 +02:00
Rainer Gerhards
33c5bb3c08 first version supporting udp spoofing and non-spoofing at the same time
omudpspoof is now a dedicated output module. It's calling semantics so far
are based on omfwd, plus the need for the template to have the IP address
as a string in the starting position.
2009-07-09 11:27:10 +02:00
Rainer Gerhards
a7f8d99884 moved udp spoofing code to its own output module (omudpspoof) 2009-07-09 10:23:49 +02:00
Rainer Gerhards
3e4aa167ee Merge branch 'master' into udpspoof
Conflicts:
	tools/omfwd.c
2009-07-09 09:42:32 +02:00
David Lang
e2c9493b0d changed imudp so that it supports sender spoofing.
This patch disables non-spoofed mode, it is primarily a code contribution
to facilitate building a full-blown, configurable spoofing capabity. But
obviously it can also be used in cases where only spoofing is desired.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-07-08 19:42:07 +02:00
Rainer Gerhards
bca66bc139 some minor bugfixes
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
  set of files (e.g. *.conf, where none such files existed)
  thanks to Michael Biebl for reporting this bug
- bugfix: when run in foreground (but not in debug mode), a
  debug message ("DoDie called") was emitted at shutdown. Removed.
  thanks to Michael Biebl for reporting this bug
- bugfix: some garbagge was emitted to stderr on shutdown. This
  garbage consisted of file names, which were written during
  startup (key point: not a pointer error)
  thanks to Michael Biebl for reporting this bug
- bugfix: startup and shutdown message were emitted to stdout
  thanks to Michael Biebl for reporting this bug
2009-06-18 11:10:28 +02:00
Rainer Gerhards
e3d9843c85 re-enabled pipe, tty and console in omfile
... by moving code to stream.c. Thanks to the new design, new cases are
not really needed, resulting in cleaner code.

I also did a cleanup of header file usage as a side-activity.
2009-06-12 11:47:00 +02:00
Rainer Gerhards
36fe8d92f8 added ability for the UDP output action to rebind its send socket after sending n messages
New config directive $ActionSendUDPRebindInterval
added for the purpose. By default, rebinding is disabled. This is
considered useful for load balancers.
2009-05-29 17:25:16 +02:00
Demo
e3f21521cd fixed some problems with "make check"
interestingly, they manifested on Debian, only, but potentially
existed on other platforms, too.
2009-03-31 22:10:37 +02:00
Rainer Gerhards
67e00c0631 bugfix: fixed some segaults on Solaris
where vsprintf() does not check for NULL pointers
2009-03-25 17:59:35 +01:00
Rainer Gerhards
1a9ac0ced7 removed compile time fixed message size limit (was 2K)
The limit can now be set via $MaxMessageSize global config
directive (finally gotten rid of MAXLINE ;))
2008-09-02 11:38:31 +02:00
Rainer Gerhards
15adf8f1fd bugfix: IPv6 addresses could not be specified in forwarding actions
New syntax @[addr]:port introduced to enable that. Root problem was IPv6
addresses contain colons.
Also somewhat enhanced debugging messages.
2008-08-05 15:02:49 +02:00
Rainer Gerhards
40a4ddac7a bugfix: UDP syslog forwarding did not work on all platforms
the ai_socktype was incorrectly set to 1. On some platforms, this
lead to failing name resolution (e.g. FreeBSD 7). Thanks to HKS for
reporting the bug.
2008-07-14 14:46:47 +02:00
Rainer Gerhards
4fd9852957 Merge branch 'beta'
Conflicts:

	ChangeLog
	conf.c
	doc/Makefile.am
	doc/manual.html
	omfwd.c
	plugins/omgssapi/omgssapi.c

This was a bit hard to merge; if there are problems, they
may be in the area of the new "comment in action line" code
that came from the beta.
2008-07-01 15:09:07 +02: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
55e01da2ec somewhat improved plain tcp syslog reliability
...by doing a connection check before sending. Credits to Martin
Schuette for providing the idea. Details are available at
http://blog.gerhards.net/2008/06/reliable-plain-tcp-syslog-once-again.html
2008-06-09 12:40:54 +02:00
Rainer Gerhards
99e97dadf1 bugfix: removed some memory leaks in TLS code 2008-06-04 09:37:10 +02:00
Rainer Gerhards
cd2cee6de2 Merge branch 'ietf-tls' 2008-05-27 14:51:04 +02:00
Rainer Gerhards
492fb2ffe2 changed config directive name to reflect different use
$ActionSendStreamDriverCertFingerprint is now
$ActionSendStreamDriverPermittedPeer and can be used both for
fingerprint and name authentication (similar to the input side)
2008-05-22 18:58:04 +02:00
Rainer Gerhards
ff446070be Merge branch 'ietf-tls'
Conflicts:

	ChangeLog
2008-05-21 12:23:41 +02:00
varmojfekoj
6e97513eea bugfix: default syslog port was no longer used if none was configured.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-05-21 12:08:23 +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
Rainer Gerhards
edf41396ef regained netstream driver genericity; improved drivers
- made action logic pass optional auth params only if they are
  actually configured
- added new authMode and Fingerprint methods to ptcp netstream
  driver (keeping them once again generic)
- added diagnostics messages when invalid auth modes were
  configured
2008-05-17 11:19:12 +02:00
Rainer Gerhards
6ea98ec5ff added first rough ability to authenticate the server against its certificate
This is very experimental and needs some more work. It probably even
segfaults - but the base code is there and running. The rest is
refinement.

While working on this, I did these two bugfixes:
- bugfix: small mem leak in omfwd on exit (strmdriver name was not freed)
- bugfix: $ActionSendStreamDriver had no effect
2008-05-16 18:26:25 +02:00
Rainer Gerhards
62097331cc invalid strdup when no driver name was set caused segfault 2008-05-05 14:34:13 +02:00
Rainer Gerhards
7022e9019e support for different forwarding stream drivers added
they can now be set on an action-by-action basis
2008-05-05 14:19:12 +02:00
Rainer Gerhards
da88900143 added $InputTCPServerStreamDriverMode config directive 2008-04-30 18:53:21 +02:00
Rainer Gerhards
055d4ffc2a fixed problem with module unload sequence 2008-04-29 15:36:22 +02:00
Rainer Gerhards
a3ff7eaf85 added $ActionSendStreamDriverMode config directive 2008-04-28 14:21:58 +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
1daf8d492f converted netstrm into generic netstrm and the nsd_pctp driver 2008-04-18 11:40:15 +02:00
Rainer Gerhards
ea4a3a3cd9 improvements in omfwd and cleanup of omgssapi
- some (small) cleanup of omgssapi
- optimized omfwed, now loads TCP code only if this is actually necessary
2008-04-17 19:03:51 +02:00
Rainer Gerhards
f590c1d52a modified omfwd to work with netstrm (and also did some cleanup) 2008-04-17 18:06:06 +02:00
Rainer Gerhards
8c65706d22 moved "family" variable to global data pool 2008-04-17 09:25:03 +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