From 6e3980abbdb5d98a66d656456f993374b0be9565 Mon Sep 17 00:00:00 2001 From: Milan Bartos Date: Tue, 11 Sep 2012 10:10:37 +0200 Subject: Added new module, imkmsg, for structured kernel logs from /dev/kmsg. This is still in development, bute ready to be commited to master. modified: Makefile.am modified: configure.ac new file: plugins/imkmsg/Makefile.am new file: plugins/imkmsg/imkmsg.c new file: plugins/imkmsg/imkmsg.h new file: plugins/imkmsg/kmsg.c --- plugins/imkmsg/imkmsg.h | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 plugins/imkmsg/imkmsg.h (limited to 'plugins/imkmsg/imkmsg.h') diff --git a/plugins/imkmsg/imkmsg.h b/plugins/imkmsg/imkmsg.h new file mode 100644 index 00000000..acfb50ab --- /dev/null +++ b/plugins/imkmsg/imkmsg.h @@ -0,0 +1,68 @@ +/* imklog.h + * These are the definitions for the klog message generation module. + * + * File begun on 2007-12-17 by RGerhards + * Major change: 2008-04-09: switched to a driver interface for + * several platforms + * + * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef IMKLOG_H_INCLUDED +#define IMKLOG_H_INCLUDED 1 + +#include "rsyslog.h" +#include "dirty.h" + +/* we need to have the modConf type present in all submodules */ +struct modConfData_s { + rsconf_t *pConf; + int iFacilIntMsg; + uchar *pszPath; + int console_log_level; + sbool bPermitNonKernel; + sbool configSetViaV2Method; +}; + +/* interface to "drivers" + * the platform specific drivers must implement these entry points. Only one + * driver may be active at any given time, thus we simply rely on the linker + * to resolve the addresses. + * rgerhards, 2008-04-09 + */ +rsRetVal klogLogKMsg(modConfData_t *pModConf); +rsRetVal klogWillRun(modConfData_t *pModConf); +rsRetVal klogAfterRun(modConfData_t *pModConf); +int klogFacilIntMsg(); + +/* the functions below may be called by the drivers */ +rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); +rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp); + +/* prototypes */ +extern int klog_getMaxLine(void); /* work-around for klog drivers to get configured max line size */ +extern int InitKsyms(modConfData_t*); +extern void DeinitKsyms(void); +extern int InitMsyms(void); +extern void DeinitMsyms(void); +extern char * ExpandKadds(char *, char *); +extern void SetParanoiaLevel(int); + +#endif /* #ifndef IMKLOG_H_INCLUDED */ +/* vi:set ai: + */ -- cgit v1.2.3 From 91948f610807cb5f42d15af5448126315fd9a0dd Mon Sep 17 00:00:00 2001 From: Milan Bartos Date: Wed, 12 Sep 2012 08:25:39 +0200 Subject: Modified comments. modified: imkmsg.c modified: imkmsg.h modified: kmsg.c --- plugins/imkmsg/imkmsg.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'plugins/imkmsg/imkmsg.h') diff --git a/plugins/imkmsg/imkmsg.h b/plugins/imkmsg/imkmsg.h index acfb50ab..d33186b0 100644 --- a/plugins/imkmsg/imkmsg.h +++ b/plugins/imkmsg/imkmsg.h @@ -1,9 +1,5 @@ -/* imklog.h - * These are the definitions for the klog message generation module. - * - * File begun on 2007-12-17 by RGerhards - * Major change: 2008-04-09: switched to a driver interface for - * several platforms +/* imkmsg.h + * These are the definitions for the kmsg message generation module. * * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. * @@ -51,7 +47,7 @@ rsRetVal klogAfterRun(modConfData_t *pModConf); int klogFacilIntMsg(); /* the functions below may be called by the drivers */ -rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); +rsRetVal imkmsgLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp); /* prototypes */ -- cgit v1.2.3 From 498b8600707e979f78ee02641d56702784138b70 Mon Sep 17 00:00:00 2001 From: Milan Bartos Date: Wed, 12 Sep 2012 09:39:34 +0200 Subject: Made imkmsg parse the messages instead of creating string to be parsed later. modified: imkmsg.c modified: imkmsg.h modified: kmsg.c --- plugins/imkmsg/imkmsg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/imkmsg/imkmsg.h') diff --git a/plugins/imkmsg/imkmsg.h b/plugins/imkmsg/imkmsg.h index d33186b0..220a1634 100644 --- a/plugins/imkmsg/imkmsg.h +++ b/plugins/imkmsg/imkmsg.h @@ -48,7 +48,7 @@ int klogFacilIntMsg(); /* the functions below may be called by the drivers */ rsRetVal imkmsgLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3))); -rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp); +rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp, struct json_object *json); /* prototypes */ extern int klog_getMaxLine(void); /* work-around for klog drivers to get configured max line size */ -- cgit v1.2.3