From 53a0ed8b3a03aa5d7bf40cb69b02391e5e5ca9d1 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 16 Apr 2008 16:41:00 +0200 Subject: completed im3195 including some documentation --- ChangeLog | 1 + configure.ac | 2 +- doc/im3195.html | 46 ++++++++++++++++++++++++++++++++++++++++++ doc/rsyslog_conf.html | 4 +++- doc/rsyslog_ng_comparison.html | 4 ++-- plugins/im3195/im3195.c | 8 ++++---- 6 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 doc/im3195.html diff --git a/ChangeLog b/ChangeLog index 29c12e9c..903ec85c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +- implemented im3195, the RFC3195 input as a plugin --------------------------------------------------------------------------- Version 3.17.1 (rgerhards), 2008-04-15 - removed dependency on MAXHOSTNAMELEN as much as it made sense. diff --git a/configure.ac b/configure.ac index 732e5a82..6b7a6844 100644 --- a/configure.ac +++ b/configure.ac @@ -553,7 +553,7 @@ AC_ARG_ENABLE(rfc3195, [enable_rfc3195=no] ) if test "x$enable_rfc3195" = "xyes"; then - PKG_CHECK_MODULES(LIBLOGGING, liblogging >= 0.7.0) + PKG_CHECK_MODULES(LIBLOGGING, liblogging >= 0.7.1) fi AM_CONDITIONAL(ENABLE_RFC3195, test x$enable_rfc3195 = xyes) AC_SUBST(RFC3195_CFLAGS) diff --git a/doc/im3195.html b/doc/im3195.html new file mode 100644 index 00000000..d6f2f2ed --- /dev/null +++ b/doc/im3195.html @@ -0,0 +1,46 @@ + + +RFC3195 Input Module (im3195) + + + +

RFC3195 Input Module

Module Name: im3195

Author: Rainer Gerhards +<rgerhards@adiscon.com>

Description:

Receives syslog messages via RFC 3195. The RAW profile is fully implemented and the +COOKED profile is provided in an experimental state. This module uses +liblogging for the actual protocol handling.

Configuration Directives:

$Input3195ListenPort <port>
+The port on which imklog listens for RFC 3195 messages. The default port is 601 +(the IANA-assigned port)

+Caveats/Known Bugs: +

Due to no demand at all for RFC3195, we have converted rfc3195d +to this input module, but we have NOT conducted any testing. Also, +the module does not yet properly handle the recovery case. If someone +intends to put this module into production, good testing should be +cunducted. It also is a good idea to notify the rsyslog project that you intend to use +it in production. In this case, we'll probably give the module another +cleanup. We don't do this now because so far it looks just like a big +waste of time. +

Currently only a single listener can be defined. That one binds to all interfaces.

Sample:

The following sample accepts syslog messages via RFC 3195 on port 1601. +
+

+ +

[rsyslog.conf overview] +[manual index] [rsyslog site]

This documentation is part of the +rsyslog project.
+Copyright © 2008 by Rainer +Gerhards and +Adiscon. +Released under the GNU GPL version 3 or higher.

+ diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index 9325f73c..4dcef903 100644 --- a/doc/rsyslog_conf.html +++ b/doc/rsyslog_conf.html @@ -50,6 +50,8 @@ input plugin for plain tcp and GSS-enable syslog

imklog - kernel logging

imuxsock - unix sockets, including the system log socket

im3195 - +accepts syslog messages via RFC 3195

Please note that each module provides configuration directives, which are NOT necessarily being listed below. Also @@ -1190,4 +1192,4 @@ additional and database support). For obvious reasons, the syntax for defining such features is available in rsyslogd, only.

- \ No newline at end of file + diff --git a/doc/rsyslog_ng_comparison.html b/doc/rsyslog_ng_comparison.html index 28413337..0d57a374 100644 --- a/doc/rsyslog_ng_comparison.html +++ b/doc/rsyslog_ng_comparison.html @@ -57,7 +57,7 @@ comparison sheet, so please don't be shy ;)

RFC 3195/BEEP -yes (needs separate build process) +yes (via im3195) no @@ -580,4 +580,4 @@ the mean time, you may want to read it in parallel. It is available at site.

This document is current as of 2008-04-08 and definitely incomplete (I did not yet manage to complete it!).

- \ No newline at end of file + diff --git a/plugins/im3195/im3195.c b/plugins/im3195/im3195.c index 6bc2c4e9..51afd870 100644 --- a/plugins/im3195/im3195.c +++ b/plugins/im3195/im3195.c @@ -42,9 +42,9 @@ #include #include "rsyslog.h" #include "syslogd.h" -#include "liblogging.h" -#include "srAPI.h" -#include "syslogmessage.h" +#include "liblogging/liblogging.h" +#include "liblogging/srAPI.h" +#include "liblogging/syslogmessage.h" #include "module-template.h" #include "cfsysline.h" #include "errmsg.h" @@ -74,7 +74,7 @@ static srAPIObj* pAPI; * best solution, but real-world experience might tell us a * different truth ;) */ -void OnReceive(srAPIObj* __attribute__((unused)) pMyAPI, srSLMGObj* pSLMG) +void OnReceive(srAPIObj __attribute__((unused)) *pMyAPI, srSLMGObj* pSLMG) { uchar *pszRawMsg; uchar *fromHost = (uchar*) "[unset]"; /* TODO: get hostname */ -- cgit