You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(23) |
Oct
(2) |
Nov
(1) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(4) |
Feb
(11) |
Mar
(1) |
Apr
(104) |
May
(18) |
Jun
(42) |
Jul
|
Aug
(4) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
From: <al...@us...> - 2003-10-26 15:04:34
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv11422/src Modified Files: syslogd.h Log Message: fixed overlapping flags. from report by Bob Perkins. Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- syslogd.h 17 Jun 2003 16:35:55 -0000 1.130 +++ syslogd.h 26 Oct 2003 15:02:28 -0000 1.131 @@ -151,30 +151,30 @@ /* fields used */ -#define M_FIELD_FLAGS 0x00001 -#define M_FIELD_MSG 0x00002 -#define M_FIELD_HOST 0x00004 -#define M_FIELD_PROG 0x00008 -#define M_FIELD_USER 0x00010 -#define M_FIELD_PRI 0x00020 -#define M_FIELD_FAC 0x00040 -#define M_FIELD_SEC 0x00080 -#define M_FIELD_MIN 0x00100 -#define M_FIELD_HOUR 0x00200 -#define M_FIELD_MDAY 0x00400 -#define M_FIELD_MONTH 0x00800 -#define M_FIELD_YEAR 0x01000 -#define M_FIELD_WDAY 0x02000 -#define M_FIELD_YDAY 0x04000 -#define M_FIELD_UID 0x08000 -#define M_FIELD_GID 0x01000 -#define M_FIELD_EUID 0x02000 -#define M_FIELD_EGID 0x04000 -#define M_FIELD_PID 0x08000 -#define M_FIELD_SENT 0x10000 -#define M_FIELD_LPEO 0x20000 -#define M_FIELD_TM 0x40000 -#define M_FIELD_DATE 0x80000 +#define M_FIELD_FLAGS 0x000001 +#define M_FIELD_MSG 0x000002 +#define M_FIELD_HOST 0x000004 +#define M_FIELD_PROG 0x000008 +#define M_FIELD_USER 0x000010 +#define M_FIELD_PRI 0x000020 +#define M_FIELD_FAC 0x000040 +#define M_FIELD_SEC 0x000080 +#define M_FIELD_MIN 0x000100 +#define M_FIELD_HOUR 0x000200 +#define M_FIELD_MDAY 0x000400 +#define M_FIELD_MONTH 0x000800 +#define M_FIELD_YEAR 0x001000 +#define M_FIELD_WDAY 0x002000 +#define M_FIELD_YDAY 0x004000 +#define M_FIELD_UID 0x008000 +#define M_FIELD_GID 0x010000 +#define M_FIELD_EUID 0x020000 +#define M_FIELD_EGID 0x040000 +#define M_FIELD_PID 0x080000 +#define M_FIELD_SENT 0x100000 +#define M_FIELD_LPEO 0x200000 +#define M_FIELD_TM 0x400000 +#define M_FIELD_DATE 0x800000 /* beware the element count of this list should fit on fields member */ /* |
From: <jk...@us...> - 2003-08-22 03:57:11
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv15231/src Modified Files: modules.h Log Message: Include stdint.h if available. It's needed on Linux + GCC 3.3 + libc-2.3.2 at least. Index: modules.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.h,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- modules.h 17 Jun 2003 16:35:55 -0000 1.60 +++ modules.h 21 Aug 2003 03:00:19 -0000 1.61 @@ -31,6 +31,10 @@ #ifndef SYSLOG_MODULES_H #define SYSLOG_MODULES_H +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif + #ifndef MAXHOSTNAMELEN # include <netdb.h> # ifndef MAXHOSTNAMELEN |
From: <jk...@us...> - 2003-08-22 03:55:06
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv16904 Modified Files: configure.in Log Message: Require autoconf version 2.52 at minimum. Added the required third paramater to AC_DEFINE{,_UNQUOTED} macro calls. Check large files support. Index: configure.in =================================================================== RCS file: /cvsroot/msyslog/syslog/configure.in,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -r1.165 -r1.166 --- configure.in 13 Jun 2003 20:02:59 -0000 1.165 +++ configure.in 21 Aug 2003 03:13:31 -0000 1.166 @@ -3,6 +3,8 @@ AC_INIT(src/syslogd.c) AC_CONFIG_HEADER(src/config.h) +AC_PREREQ(2.52) + dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL @@ -28,7 +30,7 @@ VIS_C=""; AC_CHECK_HEADER(vis.h, [ - AC_DEFINE(HAVE_VIS_H, 1) + AC_DEFINE(HAVE_VIS_H, 1, [This is not an original description]) ], [ VIS_C="vis.c"; ]) @@ -52,13 +54,15 @@ AC_CHECK_LIB(dl, dlopen, SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl") AC_CHECK_LIB(socket, connect, SYSLOGD_LIBS="$SYSLOGD_LIBS -lsocket") AC_CHECK_LIB(nsl, gethostbyname, SYSLOGD_LIBS="$SYSLOGD_LIBS -lnsl") -AC_DEFINE(SYSLOGD_LIBS, $SYSLOGD_LIBS) +AC_DEFINE(SYSLOGD_LIBS, $SYSLOGD_LIBS, [This is not an original description]) AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP AC_TYPE_SIGNAL dnl It should have strftime! dnl AC_FUNC_STRFTIME AC_FUNC_VPRINTF +AC_SYS_LARGEFILE + LIBS_SAVE="$LIBS" LIBS="$LIBS $SYSLOGD_LIBS" AC_CHECK_FUNCS(gethostname inet_ntop getaddrinfo regcomp poll select\ @@ -79,11 +83,11 @@ MSYSLOG_VERSION="1.10" -AC_DEFINE_UNQUOTED(MSYSLOG_VERSION_STR, "$MSYSLOG_VERSION") +AC_DEFINE_UNQUOTED(MSYSLOG_VERSION_STR, "$MSYSLOG_VERSION", [This is not an original description]) echo msyslog version... $MSYSLOG_VERSION MLIBNAME="libmsyslog.so.$MSYSLOG_VERSION" ; -AC_DEFINE_UNQUOTED(MLIBNAME_STR, "$MLIBNAME") +AC_DEFINE_UNQUOTED(MLIBNAME_STR, "$MLIBNAME", [This is not an original description]) MANPAGES="syslog.conf.5 syslogd.8" @@ -91,7 +95,7 @@ then prefix=$ac_default_prefix fi -AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "$prefix/lib/alat") +AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "$prefix/lib/alat", [This is not an original description]) AC_MSG_CHECKING(pidfile directory) @@ -157,20 +161,20 @@ MAIN_CPPFLAGS=""; UNAME=`uname` if test "$UNAME" = "OpenBSD" ; then - AC_DEFINE(DLOPEN_FLAGS, DL_LAZY) + AC_DEFINE(DLOPEN_FLAGS, DL_LAZY, [Flags to dlopen(3)]) DCCFLAGS="-fPIC" elif test "$UNAME" = "Linux" ; then - AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY | RTLD_GLOBAL) + AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY | RTLD_GLOBAL, [Flags to dlopen(3)]) MAIN_CPPFLAGS="-Xlinker -E"; DCCFLAGS="" - AC_DEFINE(_GNU_SOURCE, 1) + AC_DEFINE(_GNU_SOURCE, 1, [This is not an original description]) elif test "$UNAME" = "SunOS" ; then - AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY) - AC_DEFINE(_REENTRANT, 1) + AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY, [Flags to dlopen(3)]) + AC_DEFINE(_REENTRANT, 1, [This is not an original description]) DCCFLAGS="-fPIC" elif test "$UNAME" = "IRIX" -o "$UNAME" = "IRIX64" ; then - AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY) - AC_DEFINE(INET6, 1) + AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY, [Flags to dlopen(3)]) + AC_DEFINE(INET6, 1, [This is not an original description]) CFLAGS="-D_BSD_SIGNALS" if test "x$GCC" == "xyes" then @@ -182,8 +186,8 @@ fi fi elif test "$UNAME" = "AIX" ; then - AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY | RTLD_GLOBAL) - AC_DEFINE(NEEDS_DLOPEN_NULL, 1) + AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY | RTLD_GLOBAL, [Flags to dlopen(3)]) + AC_DEFINE(NEEDS_DLOPEN_NULL, 1, [This is not an original description]) DCCFLAGS="-shared" cat > src/modules/libmsyslog.imp <<-EOF #! . @@ -198,14 +202,14 @@ SYSLOGD_LIBS="$SYSLOGD_LIBS -Wl,-bexpall" else AC_MSG_WARN(cannot determine system type falling to defaults) - AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY) + AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY, [Flags to dlopen(3)]) fi # Name of pidfile if test "$UNAME" = "Linux" ; then - AC_DEFINE(PID_FILE, "syslogd.pid") + AC_DEFINE(PID_FILE, "syslogd.pid", [This is not an original description]) else - AC_DEFINE(PID_FILE, "syslog.pid") + AC_DEFINE(PID_FILE, "syslog.pid", [This is not an original description]) fi dnl @@ -227,7 +231,7 @@ if test "X$temp_res" = "Xyes" ; then MSRCS="$MSRCS im_bsd.c"; MANPAGES="$MANPAGES im_bsd.8"; - AC_DEFINE(HAVE_BSD_IMODULE, 1) + AC_DEFINE(HAVE_BSD_IMODULE, 1, [This is not an original description]) fi AC_ARG_WITH(linux, @@ -237,13 +241,13 @@ if test "$with_linux" = "yes" ; then MSRCS="$MSRCS im_linux.c" MANPAGES="$MANPAGES im_linux.8" - AC_DEFINE(HAVE_LINUX_IMODULE, 1) + AC_DEFINE(HAVE_LINUX_IMODULE, 1, [This is not an original description]) fi ],[ AC_CHECK_HEADER(sys/klog.h, [ MSRCS="$MSRCS im_linux.c" MANPAGES="$MANPAGES im_linux.8" - AC_DEFINE(HAVE_LINUX_IMODULE, 1) + AC_DEFINE(HAVE_LINUX_IMODULE, 1, [This is not an original description]) ]) ]) @@ -272,7 +276,7 @@ ]) if test "X$temp_res" = "Xyes" ; then MSRCS="$MSRCS im_unix.c" - AC_DEFINE(HAVE_UNIX_IMODULE, 1) + AC_DEFINE(HAVE_UNIX_IMODULE, 1, [This is not an original description]) MANPAGES="$MANPAGES im_unix.8" fi temp_res="yes"; @@ -283,7 +287,7 @@ ],[ temp_res="$with_file"; ]) if test "X$temp_res" = "Xyes" ; then MSRCS="$MSRCS im_file.c" - AC_DEFINE(HAVE_FILE_IMODULE, 1) + AC_DEFINE(HAVE_FILE_IMODULE, 1, [This is not an original description]) MANPAGES="$MANPAGES im_file.8" fi @@ -293,7 +297,7 @@ ],[ temp_res="$with_serial"; ]) if test "X$temp_res" = "Xyes" ; then MSRCS="$MSRCS im_serial.c" - AC_DEFINE(HAVE_SERIAL_IMODULE, 1) + AC_DEFINE(HAVE_SERIAL_IMODULE, 1, [This is not an original description]) MANPAGES="$MANPAGES im_serial.8" fi @@ -306,13 +310,13 @@ # if test "$with_doors" = "yes" ; then # MSRCS="$MSRCS im_doors.c" # MANPAGES="$MANPAGES im_doors.8" -# AC_DEFINE(HAVE_LINUX_IMODULE, 1) +# AC_DEFINE(HAVE_LINUX_IMODULE, 1, [This is not an original description]) # fi # ],[ # AC_CHECK_HEADER(sys/klog.h, [ # MSRCS="$MSRCS im_doors.c" # MANPAGES="$MANPAGES im_doors.8" -# AC_DEFINE(HAVE_LINUX_IMODULE, 1) +# AC_DEFINE(HAVE_LINUX_IMODULE, 1, [This is not an original description]) # ]) # ]) @@ -338,7 +342,7 @@ MLIBS="$MLIBS -lpthread" MANPAGES="$MANPAGES im_streams.8" SYSLOGD_LIBS="$SYSLOGD_LIBS -lthread -ldoor" - AC_DEFINE(HAVE_STREAMS_IMODULE, 1) + AC_DEFINE(HAVE_STREAMS_IMODULE, 1, [This is not an original description]) fi AC_MSG_CHECKING(for streams module) AC_MSG_RESULT($temp_res) @@ -374,7 +378,7 @@ if test "$temp_res" = "yes" ; then AC_EGREP_HEADER(sa_len, [#include <sys/socket.h> ], - AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1)) + AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [This is not an original description])) fi AC_ARG_WITH(oracle, @@ -385,13 +389,13 @@ MSRCS="$MSRCS om_oracle8i.c" MANPAGES="$MANPAGES om_oracle8i.8" USESQL="yes" - AC_DEFINE(HAVE_ORACLE8I_OMODULE, 1) + AC_DEFINE(HAVE_ORACLE8I_OMODULE, 1, [This is not an original description]) fi ],[ MSRCS="$MSRCS om_oracle8i.c" MANPAGES="$MANPAGES om_oracle8i.8" USESQL="yes" - AC_DEFINE(HAVE_ORACLE8I_MODULE, 1) + AC_DEFINE(HAVE_ORACLE8I_MODULE, 1, [This is not an original description]) ]) AC_ARG_WITH(mysql, @@ -433,13 +437,13 @@ if test $with_queue = "yes" ; then MSRCS="$MSRCS om_queue.c om_directory.c" MANPAGES="$MANPAGES om_directory.8" - AC_DEFINE(HAVE_QUEUE_OMODULE, 1) + AC_DEFINE(HAVE_QUEUE_OMODULE, 1, [This is not an original description]) fi ] dnl ,[ dnl MSRCS="$MSRCS om_queue.c om_directory.c" dnl MANPAGES="$MANPAGES om_directory.8" -dnl AC_DEFINE(HAVE_QUEUE_OMODULE, 1) +dnl AC_DEFINE(HAVE_QUEUE_OMODULE, 1, [This is not an original description]) dnl ] ) @@ -450,12 +454,12 @@ if test $with_refract = "yes" ; then MSRCS="$MSRCS om_refract.c" MANPAGES="$MANPAGES om_refract.8" - AC_DEFINE(HAVE_REFRACT_OMODULE, 1) + AC_DEFINE(HAVE_REFRACT_OMODULE, 1, [This is not an original description]) fi ],[ MSRCS="$MSRCS om_refract.c" MANPAGES="$MANPAGES om_refract.8" - AC_DEFINE(HAVE_REFRACT_OMODULE, 1) + AC_DEFINE(HAVE_REFRACT_OMODULE, 1, [This is not an original description]) ]) AC_ARG_WITH(regex, @@ -491,7 +495,7 @@ -o "$ac_cv_header_ucd_snmp_ucd_snmp_config_h" == yes \); then MSRCS="$MSRCS om_snmptrap.c" MANPAGES="$MANPAGES om_snmptrap.8" - AC_DEFINE(HAVE_SNMPTRAP_OMODULE, 1) + AC_DEFINE(HAVE_SNMPTRAP_OMODULE, 1, [This is not an original description]) fi |
From: <jk...@us...> - 2003-08-22 03:54:21
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv17341 Modified Files: configure Log Message: Regenerated from configure.in. Index: configure =================================================================== RCS file: /cvsroot/msyslog/syslog/configure,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- configure 13 Jun 2003 20:02:58 -0000 1.102 +++ configure 21 Aug 2003 03:16:40 -0000 1.103 @@ -1,12 +1,81 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.57. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## [...8231 lines suppressed...] chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -5884,8 +8261,11 @@ # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. |
From: <jk...@us...> - 2003-08-22 03:54:19
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv17341/src Modified Files: config.h.in Log Message: Regenerated from configure.in. Index: config.h.in =================================================================== RCS file: /cvsroot/msyslog/syslog/src/config.h.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- config.h.in 4 Jun 2003 17:19:40 -0000 1.37 +++ config.h.in 21 Aug 2003 03:16:40 -0000 1.38 @@ -1,158 +1,285 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* src/config.h.in. Generated from configure.in by autoheader. */ -/* Define to empty if the keyword does not work. */ -#undef const +/* Flags to dlopen(3) */ +#undef DLOPEN_FLAGS -/* Define if you don't have vprintf but do have _doprnt. */ -#undef HAVE_DOPRNT +/* This is not an original description */ +#undef HAVE_BSD_IMODULE -/* Define if you have the vprintf function. */ -#undef HAVE_VPRINTF +/* Define to 1 if the system has the type `CODE'. */ +#undef HAVE_CODE -/* Define to `long' if <sys/types.h> doesn't define. */ -#undef off_t +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. + */ +#undef HAVE_DIRENT_H -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT -/* Define to `unsigned' if <sys/types.h> doesn't define. */ -#undef size_t +/* Define to 1 if you have the <err.h> header file. */ +#undef HAVE_ERR_H -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define to 1 if you have the <fcntl.h> header file. */ +#undef HAVE_FCNTL_H -/* Define if you can safely include both <sys/time.h> and <time.h>. */ -#undef TIME_WITH_SYS_TIME +/* This is not an original description */ +#undef HAVE_FILE_IMODULE -/* Define if your <sys/time.h> declares struct tm. */ -#undef TM_IN_SYS_TIME +/* Define to 1 if you have the `getaddrinfo' function. */ +#undef HAVE_GETADDRINFO -/* Define if you have the gethostname function. */ +/* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME -/* Define if you have the regcomp function. */ -#undef HAVE_REGCOMP +/* Define to 1 if you have the `inet_addr' function. */ +#undef HAVE_INET_ADDR -/* Define if you have the select function. */ +/* Define to 1 if you have the `inet_aton' function. */ +#undef HAVE_INET_ATON + +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `snmp' library (-lsnmp). */ +#undef HAVE_LIBSNMP + +/* Define to 1 if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H + +/* This is not an original description */ +#undef HAVE_LINUX_IMODULE + +/* Define to 1 if you have the <machine/endian.h> header file. */ +#undef HAVE_MACHINE_ENDIAN_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the <net-snmp/net-snmp-config.h> header file. */ +#undef HAVE_NET_SNMP_NET_SNMP_CONFIG_H + +/* This is not an original description */ +#undef HAVE_ORACLE8I_MODULE + +/* This is not an original description */ +#undef HAVE_ORACLE8I_OMODULE + +/* Define to 1 if you have the <paths.h> header file. */ +#undef HAVE_PATHS_H + +/* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL -/* Define if you have the select function. */ +/* This is not an original description */ +#undef HAVE_QUEUE_OMODULE + +/* This is not an original description */ +#undef HAVE_REFRACT_OMODULE + +/* Define to 1 if you have the `regcomp' function. */ +#undef HAVE_REGCOMP + +/* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT -/* Define if you have the socket function. */ +/* This is not an original description */ +#undef HAVE_SERIAL_IMODULE + +/* This is not an original description */ +#undef HAVE_SNMPTRAP_OMODULE + +/* This is not an original description */ +#undef HAVE_SOCKADDR_SA_LEN + +/* Define to 1 if you have the `socket' function. */ #undef HAVE_SOCKET -/* Define if you have the strdup function. */ +/* Define to 1 if the system has the type `socklen_t'. */ +#undef HAVE_SOCKLEN_T + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have the strerror function. */ -#undef HAVE_STRERROR +/* This is not an original description */ +#undef HAVE_STREAMS_IMODULE -/* Define if you have the strstr function. */ -#undef HAVE_STRSTR +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H -/* Define if you have the <dirent.h> header file. */ -#undef HAVE_DIRENT_H +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H -/* Define if you have the <fcntl.h> header file. */ -#undef HAVE_FCNTL_H +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR -/* Define if you have the <limits.h> header file. */ -#undef HAVE_LIMITS_H +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL -/* Define if you have the <ndir.h> header file. */ -#undef HAVE_NDIR_H +/* Define to 1 if you have the <sysctl.h> header file. */ +#undef HAVE_SYSCTL_H -/* Define if you have the <paths.h> header file. */ -#undef HAVE_PATHS_H +/* Define to 1 if you have the <syslog.h> header file. */ +#undef HAVE_SYSLOG_H -/* Define if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H +/* Define to 1 if you have the <sys/context.h> header file. */ +#undef HAVE_SYS_CONTEXT_H -/* Define if you have the <sys/dir.h> header file. */ +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. + */ #undef HAVE_SYS_DIR_H -/* Define if you have the <sys/ioctl.h> header file. */ +/* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the <sys/ndir.h> header file. */ +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. + */ #undef HAVE_SYS_NDIR_H -/* Define if you have the <sys/time.h> header file. */ +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the <syslog.h> header file. */ -#undef HAVE_SYSLOG_H +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H -/* Define if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H -#undef HAVE_SYSCTL_H -#undef HAVE_ERR_H +/* Define to 1 if you have the <ucd-snmp/ucd-snmp-config.h> header file. */ +#undef HAVE_UCD_SNMP_UCD_SNMP_CONFIG_H -#undef MSYSLOG_VERSION_STR -#undef MLIBNAME_STR -#undef INSTALL_LIBDIR -#undef PID_DIR -#undef PID_FILE +/* Define to 1 if the system has the type `uint32_t'. */ +#undef HAVE_UINT32_T -#undef HAVE_OPTRESET +/* Define to 1 if the system has the type `uint64_t'. */ +#undef HAVE_UINT64_T -#undef DLOPEN_FLAGS +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H -#undef HAVE_SRANDOM -#undef HAVE_MD5 -#undef HAVE_SHA1 -#undef HAVE_RMD160 +/* This is not an original description */ +#undef HAVE_UNIX_IMODULE -#undef HAVE_SOCKLEN_T -#undef HAVE_UINT32_T -#undef HAVE_UINT64_T +/* Define to 1 if the system has the type `u_int32_t'. */ #undef HAVE_U_INT32_T -#undef HAVE___UINT32_T + +/* Define to 1 if the system has the type `u_int64_t'. */ #undef HAVE_U_INT64_T + +/* This is not an original description */ +#undef HAVE_VIS_H + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if the system has the type `__uint32_t'. */ +#undef HAVE___UINT32_T + +/* Define to 1 if the system has the type `__uint64_t'. */ #undef HAVE___UINT64_T -#undef HAVE_CODE +/* This is not an original description */ +#undef INET6 -#undef MLIBNAME +/* This is not an original description */ +#undef INSTALL_LIBDIR -#undef HAVE_SYS_WAIT_H +/* This is not an original description */ +#undef MLIBNAME_STR -#undef HAVE_GETADDRINFO +/* This is not an original description */ +#undef MSYSLOG_VERSION_STR -#undef HAVE_INET_NTOP -#undef HAVE_INET_ATON -#undef HAVE_INET_ADDR +/* This is not an original description */ +#undef NEEDS_DLOPEN_NULL -#undef HAVE_STREAMS_IMODULE -#undef HAVE_LINUX_IMODULE -#undef HAVE_BSD_IMODULE -#undef HAVE_UNIX_IMODULE -#undef HAVE_SERIAL_IMODULE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -#undef HAVE_OREACLE8I_0MODULE -#undef HAVE_SNMPTRAP_0MODULE -#undef HAVE_QUEUE_0MODULE -#undef HAVE_REFRACT_0MODULE +/* Define to the full name of this package. */ +#undef PACKAGE_NAME -#undef HAVE_SOCKADDR_SA_LEN +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING -#undef _USE_IRS +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* This is not an original description */ +#undef PID_DIR + +/* This is not an original description */ +#undef PID_FILE + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* This is not an original description */ #undef SIGALTSTACK_WITH_STACK_T -#undef HAVE_SYS_CONTEXT_H -#undef _SGIAPI -#undef INET6 +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS +/* This is not an original description */ +#undef SYSLOGD_LIBS + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#undef TIME_WITH_SYS_TIME + +/* Define to 1 if your <sys/time.h> declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN +/* Define to 1 if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* This is not an original description */ #undef _GNU_SOURCE -/* for Solaris */ +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* This is not an original description */ #undef _REENTRANT -#undef HAVE_VIS_H +/* This is not an original description */ +#undef _USE_IRS + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `long' if <sys/types.h> does not define. */ +#undef off_t + +/* Define to `unsigned' if <sys/types.h> does not define. */ +#undef size_t |
From: <al...@us...> - 2003-06-27 03:54:27
|
Update of /cvsroot/msyslog/syslog/src/modules In directory sc8-pr-cvs1:/tmp/cvs-serv10256/src/modules Modified Files: ip_misc.c Log Message: change warning to comment XXX Index: ip_misc.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/ip_misc.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ip_misc.c 11 Jun 2003 07:30:17 -0000 1.31 +++ ip_misc.c 27 Jun 2003 03:43:52 -0000 1.32 @@ -508,7 +508,7 @@ msg[rlen] = '\0'; -#warning THIS SHOULD SUPPORT SOME KIND OF DNS CACHE + /* XXX: should this should support some kind of dns cache ? */ if (flags & M_NODNS) resolv_addr_nodns(sa, salen, host, hlen, port, plen); else |
From: <al...@us...> - 2003-06-17 16:35:58
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv1158/src Modified Files: modules.c modules.h syslogd.c syslogd.h Log Message: new peo/lpeo schema while there fix some comments Index: modules.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.c,v retrieving revision 1.177 retrieving revision 1.178 diff -u -d -r1.177 -r1.178 --- modules.c 16 Jun 2003 21:15:56 -0000 1.177 +++ modules.c 17 Jun 2003 16:35:55 -0000 1.178 @@ -314,6 +314,7 @@ calloc(1, sizeof(o_module_t)); om = f->omod; om_prev = NULL; + om->peofd = -1; } else { for (om_prev = f->omod; om_prev->next; @@ -328,6 +329,23 @@ /* get this module name */ argc = 0; while (isspace((int)*(++p))); + + /* search for log protection */ + if (strncmp(p, "peo ", 4) == 0) { + + p += 4; + om->algorithm = M_PEO; + + } else if (strncmp(p, "lpeo ", 5) == 0) { + + p += 5; + om->algorithm = M_PEO | M_LPEO; + } + + if (om->algorithm & M_PEO) + if (peo_open(om, &p) == -1) + goto omodule_create_bad; + argv[argc++] = p; while (!isspace((int)*p)) p++; Index: modules.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.h,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- modules.h 16 Jun 2003 23:39:31 -0000 1.59 +++ modules.h 17 Jun 2003 16:35:55 -0000 1.60 @@ -65,6 +65,7 @@ /* XXX: remove this */ char *status; void *md; /* digest algorithm */ + int peofd; /* peo state file */ uint32_t slen; /* user (name) length */ uint16_t algorithm; /* protection algorithm */ } o_module_t; Index: syslogd.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.c,v retrieving revision 1.265 retrieving revision 1.266 diff -u -d -r1.265 -r1.266 --- syslogd.c 16 Jun 2003 19:18:39 -0000 1.265 +++ syslogd.c 17 Jun 2003 16:35:55 -0000 1.266 @@ -123,6 +123,7 @@ #endif #define SYSLOG_NAMES +#include <openssl/evp.h> #include <syslog.h> #include "modules.h" #include "syslogd.h" @@ -234,12 +235,14 @@ uint32_t msg_save_max = 50; /* fast hex to char conversion, to avoid printf */ -char hex_vals[] = "0123456789abcdef"; /* fijate si lo queres en minusculas */ +char hex_vals[] = "0123456789abcdef"; #define CONV_BIN2HEX(b,h,l) { \ l = (hex_vals[b & 0x0f]) ; \ h = (hex_vals[(b & 0xf0) >> 4]) ; \ } - +char *hash_method; /* hashing method */ +char *crypto_method; /* crypto method */ + /* * main: @@ -255,7 +258,6 @@ stack_t alt_stack; #endif struct sigaction sa; - char *method; int ch; int argcnt; int default_inputs = 1; /* start default modules? */ @@ -263,7 +265,8 @@ Inputs.next = NULL; Inputs.fd = -1; - method = "sha1"; + hash_method = "sha1"; + crypto_method = "blowfish"; setlinebuf(stdout); @@ -348,7 +351,7 @@ DaemonFlags |= DONT_COLLAPSE; break; case 'H': - method = optarg; + hash_method = optarg; break; case 's': @@ -567,6 +570,9 @@ } m_dprintf(MSYSLOG_INFORMATIVE, "off & running....\n"); + /* set peo method, default sha1 */ + OpenSSL_add_all_digests(); + init(0); place_signal(SIGHUP, init); @@ -727,6 +733,8 @@ time(&now); localtime_r(&now, &m->tm); m->fields |= M_FIELD_TM; + strftime(m->date, sizeof(m->date), "%b %e %H:%M:%S", &m->tm); + m->fields |= M_FIELD_DATE; } void @@ -1595,7 +1603,7 @@ } /* * Heavily modified to fit sysklogd - * This should be done with lex/yacc + * XXX: This should be done with lex/yacc */ /* scan facilities */ while (*p && !strchr("\t .;", *p)) { @@ -1991,4 +1999,110 @@ FREE_PTR(m); msg_count--; } +} + +/* + * do_lpeo: + * process a message's l-PEO MAC + */ + +void +do_lpeo(m_msg_t *m, o_module_t *om) +{ + EVP_MD_CTX peo_mdctx; /* generic context for PEO use */ + int i; + + /* calculate l-PEO state and add it to iov */ + EVP_MD_CTX_init(&peo_mdctx); + EVP_DigestInit_ex(&peo_mdctx, (EVP_MD *) om->md, NULL); + + /* XXX: this is a variant, but should be OK */ + EVP_DigestUpdate(&peo_mdctx, om->state, om->slen); + EVP_DigestFinal_ex(&peo_mdctx, m->lpeo, &m->llen); + EVP_MD_CTX_cleanup(&peo_mdctx); + + /* convert to printable hex chars */ + for (i = m->llen - 1; i >= 0; i--) + CONV_BIN2HEX(m->lpeo[i], m->lpeo[i * 2], m->lpeo[(i * 2) + 1]); + m->llen *= 2; +} + +/* + * do_peo: + * recalculate current state with new message + */ + +int +do_peo(m_msg_t *m, o_module_t *om) +{ + EVP_MD_CTX peo_mdctx; /* generic context for PEO use */ + int i; + + /* + * calculate new state + * use message, host, date, priority, facility + */ + EVP_MD_CTX_init(&peo_mdctx); + EVP_DigestInit_ex(&peo_mdctx, (EVP_MD *) om->md, NULL); + EVP_DigestUpdate(&peo_mdctx, m->date, STD_DATE_LEN - 1); + EVP_DigestUpdate(&peo_mdctx, m->host, m->hlen); + EVP_DigestUpdate(&peo_mdctx, m->msg, m->mlen); + EVP_DigestFinal_ex(&peo_mdctx, om->state, &om->slen); + EVP_MD_CTX_cleanup(&peo_mdctx); + + /* just in case */ + if (om->slen > (sizeof(om->state) / 2)) + return (-1); + + /* convert state to printable hex chars */ + for (i = om->slen - 1; i >= 0; i--) + CONV_BIN2HEX(om->state[i], om->state[(i * 2)], om->state[(i * 2) + 1]); + om->slen *= 2; + + if (om->algorithm & M_LPEO) + do_lpeo(m, om); + + return (1); +} + +int +peo_open(o_module_t *om, char **p) +{ + char statfile[NAME_MAX]; + char ebuf[140]; + int s; + + for (s = 0; s < sizeof(statfile) && (!isspace((int)**p));) + statfile[s++] = *(*p)++; + + if (**p == ' ') + (*p)++; + + statfile[s] = '\0'; + om->peofd = open(statfile, O_RDWR, 0); + + om->md = (void *) EVP_get_digestbyname(hash_method); + + if (om->peofd < 0) { + + strncpy(ebuf, "syslogd: couldn't open PEO status" + " file ", sizeof(ebuf) - 1); + ebuf[sizeof(ebuf) - 1] = '\0'; + strncat(ebuf, statfile, sizeof(ebuf) - 1 - strlen(ebuf)); + logerror(ebuf); + return (-1); + } + om->slen = read(om->peofd, om->state, sizeof(om->state)); + if (om->slen == -1) { + + strncpy(ebuf, "syslogd: couldn't read PEO status" + " from file ", sizeof(ebuf) - 1); + ebuf[sizeof(ebuf) - 1] = '\0'; + strncat(ebuf, statfile, sizeof(ebuf) - 1 - strlen(ebuf)); + logerror(ebuf); + om->peofd = -1; + return (-1); + } + + return (1); } Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- syslogd.h 16 Jun 2003 22:55:12 -0000 1.129 +++ syslogd.h 17 Jun 2003 16:35:55 -0000 1.130 @@ -172,8 +172,9 @@ #define M_FIELD_EGID 0x04000 #define M_FIELD_PID 0x08000 #define M_FIELD_SENT 0x10000 -#define M_FIELD_PROT 0x20000 +#define M_FIELD_LPEO 0x20000 #define M_FIELD_TM 0x40000 +#define M_FIELD_DATE 0x80000 /* beware the element count of this list should fit on fields member */ /* @@ -193,11 +194,11 @@ char date[STD_DATE_LEN]; /* date in chars */ char lpeo[MAX_LPEO_LEN]; /* lpeo protection */ struct tm tm; /* time (also in vals) */ - uint16_t mlen; /* msg length */ - uint16_t hlen; /* host length */ - uint16_t plen; /* program (name) length */ - uint16_t ulen; /* user (name) length */ - uint16_t llen; + unsigned int llen; + uint32_t mlen; /* msg length */ + uint32_t hlen; /* host length */ + uint32_t plen; /* program (name) length */ + uint32_t ulen; /* user (name) length */ } m_msg_t; #define CLEAR_MSG(m) { (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \ @@ -245,6 +246,7 @@ void logmsg(int, char *, char *, int); void die(int); RETSIGTYPE (*place_signal(int signo, RETSIGTYPE (*)(int))) (int); +int peo_open(o_module_t *, char **); #define MLIB_MAX 10 /* max external libs per module */ |
From: <al...@us...> - 2003-06-17 16:35:17
|
Update of /cvsroot/msyslog/syslog/src/modules In directory sc8-pr-cvs1:/tmp/cvs-serv1063/src/modules Modified Files: om_classic.c om_tcp.c om_udp.c Log Message: fix typo, use msg not ctx Index: om_classic.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_classic.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- om_classic.c 16 Jun 2003 19:18:40 -0000 1.98 +++ om_classic.c 17 Jun 2003 16:35:12 -0000 1.99 @@ -126,7 +126,7 @@ struct iovec *v; struct om_classic_ctx *c; int l; - char line[MAXLINE + 1], greetings[500], time_buf[16]; + char line[MAXLINE + 1], greetings[500]; time_t now; INCREASE_SENT(m); @@ -149,9 +149,8 @@ } else { - strftime(time_buf, sizeof(time_buf), "%b %e %H:%M:%S", &m->tm); - v->iov_base = time_buf; - v->iov_len = 15; + v->iov_base = m->date; + v->iov_len = STD_DATE_LEN - 1; v++; v->iov_base = " "; v->iov_len = 1; Index: om_tcp.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_tcp.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- om_tcp.c 16 Jun 2003 19:18:40 -0000 1.31 +++ om_tcp.c 17 Jun 2003 16:35:12 -0000 1.32 @@ -190,7 +190,6 @@ { struct om_tcp_ctx *c; RETSIGTYPE (*sigsave)(int); - char time_buf[16]; char line[MAXLINE + 1]; int l; @@ -198,19 +197,17 @@ c = (struct om_tcp_ctx *) ctx; - strftime(time_buf, sizeof(time_buf), "%b %e %H:%M:%S", &m->tm); - /* we give a newline termination to difference lines, unlike UDP */ if (c->flags & M_ADDHOST) { l = snprintf(line, sizeof(line), "<%d>%.15s %s %s\n", - LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), time_buf, + LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), m->date, m->host, m->msg); } else { l = snprintf(line, sizeof(line), "<%d>%.15s %s\n", - LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), time_buf, + LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), m->date, m->msg); } Index: om_udp.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_udp.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- om_udp.c 16 Jun 2003 19:18:40 -0000 1.9 +++ om_udp.c 17 Jun 2003 16:35:12 -0000 1.10 @@ -171,7 +171,6 @@ om_udp_write(filed_t *f, m_msg_t *m, void *ctx) { struct om_udp_ctx *c; - char time_buf[16]; char line[MAXLINE + 1]; int l; @@ -184,18 +183,16 @@ c = (struct om_udp_ctx *) ctx; - strftime(time_buf, sizeof(time_buf), "%b %e %H:%M:%S", &m->tm); - /* we give a newline termination to difference lines */ if (c->flags & M_ADDHOST) { l = snprintf(line, sizeof(line), "<%d>%.15s %s %s\n", LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), - time_buf, m->host, m->msg); + m->date, m->host, m->msg); } else { l = snprintf(line, sizeof(line), "<%d>%.15s %s\n", LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), - time_buf, m->msg); + m->date, m->msg); } m_dprintf(MSYSLOG_INFORMATIVE, "om_udp_write: sending to %s:%s, %s", |
From: <al...@us...> - 2003-06-16 23:39:34
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv25599/src Modified Files: modules.h Log Message: message digest in o_module_t Index: modules.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- modules.h 16 Jun 2003 22:43:27 -0000 1.58 +++ modules.h 16 Jun 2003 23:39:31 -0000 1.59 @@ -64,6 +64,7 @@ void *ctx; /* XXX: remove this */ char *status; + void *md; /* digest algorithm */ uint32_t slen; /* user (name) length */ uint16_t algorithm; /* protection algorithm */ } o_module_t; |
From: <al...@us...> - 2003-06-16 22:55:16
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv20500/src Modified Files: syslogd.h Log Message: lpeo in m_msg Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- syslogd.h 16 Jun 2003 22:43:27 -0000 1.128 +++ syslogd.h 16 Jun 2003 22:55:12 -0000 1.129 @@ -117,6 +117,7 @@ #define MAX_HOST_SIZE 48 /* max host length */ #define MAX_HOST_SIZE_STR "47" /* minus one, for '\0' */ #define STD_DATE_LEN 16 /* standard syslog date */ +#define MAX_LPEO_LEN 40 /* XXX: EVP_MAX_MD_SIZE * 2 */ /* members of vals (Note: time vals here are for filtering purposes */ @@ -190,11 +191,13 @@ char user[MAX_USERNAME_SIZE]; /* user name */ uint32_t vals[MAX_VALS]; /* integer values */ char date[STD_DATE_LEN]; /* date in chars */ + char lpeo[MAX_LPEO_LEN]; /* lpeo protection */ struct tm tm; /* time (also in vals) */ - uint32_t mlen; /* msg length */ - uint32_t hlen; /* host length */ - uint32_t plen; /* program (name) length */ - uint32_t ulen; /* user (name) length */ + uint16_t mlen; /* msg length */ + uint16_t hlen; /* host length */ + uint16_t plen; /* program (name) length */ + uint16_t ulen; /* user (name) length */ + uint16_t llen; } m_msg_t; #define CLEAR_MSG(m) { (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \ |
From: <al...@us...> - 2003-06-16 22:43:31
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv19098/src Modified Files: syslogd.h modules.h Log Message: more cleanups and reorganization. more to come. Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.127 retrieving revision 1.128 diff -u -d -r1.127 -r1.128 --- syslogd.h 16 Jun 2003 21:42:30 -0000 1.127 +++ syslogd.h 16 Jun 2003 22:43:27 -0000 1.128 @@ -116,7 +116,6 @@ #define MAX_PROGNAME_SIZE_STR "31" /* minus one, for '\0' */ #define MAX_HOST_SIZE 48 /* max host length */ #define MAX_HOST_SIZE_STR "47" /* minus one, for '\0' */ -#define MAX_PEO_LEN 40 /* XXX: EVP_MAX_MD_SIZE * 2 */ #define STD_DATE_LEN 16 /* standard syslog date */ @@ -176,14 +175,6 @@ #define M_FIELD_TM 0x40000 /* beware the element count of this list should fit on fields member */ -/* hash and crytpo algorithms */ -#define M_PEO_SHA1 0x001 -#define M_PEO_RMD160 0x002 -#define M_MAC_SHA1 0x010 -#define M_MAC_RMD160 0x020 -#define M_VCR_BLOWFISH 0x100 -#define M_VCR_AES 0x200 - /* * This is the message structure. * It contains also the state information for a message. @@ -199,14 +190,11 @@ char user[MAX_USERNAME_SIZE]; /* user name */ uint32_t vals[MAX_VALS]; /* integer values */ char date[STD_DATE_LEN]; /* date in chars */ - char state[MAX_PEO_LEN]; /* msg protection */ struct tm tm; /* time (also in vals) */ uint32_t mlen; /* msg length */ uint32_t hlen; /* host length */ uint32_t plen; /* program (name) length */ uint32_t ulen; /* user (name) length */ - uint32_t slen; /* user (name) length */ - uint16_t algorithm; /* protection algorithm */ } m_msg_t; #define CLEAR_MSG(m) { (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \ @@ -258,6 +246,7 @@ #define MLIB_MAX 10 /* max external libs per module */ +/* XXX: merge this w/ o_module_t */ typedef struct omodule { char *name; int (*init) (int, char **, filed_t *, m_global_t *, void **, char **); @@ -280,15 +269,6 @@ #define BACKOFF(f) { if (++(f)->repeatcount > MAXREPEAT) \ (f)->repeatcount = MAXREPEAT; \ } - -/* values for integrity facilities */ -#define I_NONE 0 -#define I_PEO 1 -#define I_VCR 2 -#define I_OTS 3 -#define I_SHA 4 -#define DEFAULT_INTEG_FACILITY I_NONE - #ifndef TABLE_NOPRI # define TABLE_NOPRI 0 /* Value to indicate no priority in pmask */ Index: modules.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- modules.h 16 Jun 2003 19:18:39 -0000 1.57 +++ modules.h 16 Jun 2003 22:43:27 -0000 1.58 @@ -44,7 +44,13 @@ # define MAXLINE 2048 #endif -#define MAX_MODULE_NAME_LEN 255 +#define MAX_MODULE_NAME_LEN 255 +#define MAX_PEO_LEN 40 /* XXX: EVP_MAX_MD_SIZE * 2 */ + +/* hash and crytpo algorithms */ +#define M_PEO 0x001 +#define M_LPEO 0x002 +#define M_VCR 0x004 /* @@ -52,11 +58,14 @@ */ typedef struct o_module { - struct o_module *next; - struct omodule *func; /* where are this puppy's functions? */ - void *ctx; + char state[MAX_PEO_LEN]; /* msg protection */ + struct o_module *next; + struct omodule *func; /* module functions */ + void *ctx; /* XXX: remove this */ - char *status; + char *status; + uint32_t slen; /* user (name) length */ + uint16_t algorithm; /* protection algorithm */ } o_module_t; /* |
From: <al...@us...> - 2003-06-16 21:42:33
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv6508/src Modified Files: syslogd.h Log Message: protection Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- syslogd.h 16 Jun 2003 21:34:00 -0000 1.126 +++ syslogd.h 16 Jun 2003 21:42:30 -0000 1.127 @@ -116,6 +116,7 @@ #define MAX_PROGNAME_SIZE_STR "31" /* minus one, for '\0' */ #define MAX_HOST_SIZE 48 /* max host length */ #define MAX_HOST_SIZE_STR "47" /* minus one, for '\0' */ +#define MAX_PEO_LEN 40 /* XXX: EVP_MAX_MD_SIZE * 2 */ #define STD_DATE_LEN 16 /* standard syslog date */ @@ -198,12 +199,13 @@ char user[MAX_USERNAME_SIZE]; /* user name */ uint32_t vals[MAX_VALS]; /* integer values */ char date[STD_DATE_LEN]; /* date in chars */ - char prot[40]; /* msg protection */ + char state[MAX_PEO_LEN]; /* msg protection */ struct tm tm; /* time (also in vals) */ uint32_t mlen; /* msg length */ uint32_t hlen; /* host length */ uint32_t plen; /* program (name) length */ uint32_t ulen; /* user (name) length */ + uint32_t slen; /* user (name) length */ uint16_t algorithm; /* protection algorithm */ } m_msg_t; |
From: <al...@us...> - 2003-06-16 21:34:05
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv5025/src Modified Files: syslogd.h Log Message: include date string in m_msg, to avoid doing it too many times Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- syslogd.h 16 Jun 2003 19:18:39 -0000 1.125 +++ syslogd.h 16 Jun 2003 21:34:00 -0000 1.126 @@ -116,6 +116,7 @@ #define MAX_PROGNAME_SIZE_STR "31" /* minus one, for '\0' */ #define MAX_HOST_SIZE 48 /* max host length */ #define MAX_HOST_SIZE_STR "47" /* minus one, for '\0' */ +#define STD_DATE_LEN 16 /* standard syslog date */ /* members of vals (Note: time vals here are for filtering purposes */ @@ -195,14 +196,15 @@ char host[MAX_HOST_SIZE];/* source host */ char program[MAX_PROGNAME_SIZE];/* program name */ char user[MAX_USERNAME_SIZE]; /* user name */ - uint32_t vals[MAX_VALS]; /* integer values */ + uint32_t vals[MAX_VALS]; /* integer values */ + char date[STD_DATE_LEN]; /* date in chars */ char prot[40]; /* msg protection */ - uint16_t algorithm; /* PEO, LPEO and VCR algorithms */ struct tm tm; /* time (also in vals) */ uint32_t mlen; /* msg length */ uint32_t hlen; /* host length */ uint32_t plen; /* program (name) length */ uint32_t ulen; /* user (name) length */ + uint16_t algorithm; /* protection algorithm */ } m_msg_t; #define CLEAR_MSG(m) { (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \ |
From: <al...@us...> - 2003-06-16 21:16:00
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv2074/src Modified Files: modules.c Log Message: remove peo here too Index: modules.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.c,v retrieving revision 1.176 retrieving revision 1.177 diff -u -d -r1.176 -r1.177 --- modules.c 16 Jun 2003 19:18:39 -0000 1.176 +++ modules.c 16 Jun 2003 21:15:56 -0000 1.177 @@ -69,14 +69,12 @@ int om_classic_init (int, char **, filed_t *, m_global_t *, void **, char **); int om_tcp_init (int, char **, filed_t *, m_global_t *, void **, char **); int om_udp_init (int, char **, filed_t *, m_global_t *, void **, char **); -int om_peo_init (int, char **, filed_t *, m_global_t *, void **, char **); int om_regex_init (int, char **, filed_t *, m_global_t *, void **, char **); int om_mysql_init (int, char **, filed_t *, m_global_t *, void **, char **); int om_pgsql_init (int, char **, filed_t *, m_global_t *, void **, char **); int om_classic_write (filed_t *, m_msg_t *, void *); int om_tcp_write (filed_t *, m_msg_t *, void *); int om_udp_write (filed_t *, m_msg_t *, void *); -int om_peo_write (filed_t *, m_msg_t *, void *); int om_regex_write (filed_t *, m_msg_t *, void *); int om_mysql_write (filed_t *, m_msg_t *, void *); int om_pgsql_write (filed_t *, m_msg_t *, void *); @@ -86,7 +84,6 @@ int om_classic_close (filed_t *, void *); int om_tcp_close (filed_t *, void *); int om_udp_close (filed_t *, void *); -int om_peo_close (filed_t *, void *); int om_regex_close (filed_t *, void *); int om_mysql_close (filed_t *, void *); int om_pgsql_close (filed_t *, void *); @@ -161,7 +158,6 @@ { "classic", om_classic_init, om_classic_write, om_classic_flush, om_classic_close }, { "tcp", om_tcp_init, om_tcp_write, NULL, om_tcp_close }, { "udp", om_udp_init, om_udp_write, NULL, om_udp_close }, - { "peo", om_peo_init, om_peo_write, NULL, om_peo_close }, { "regex", om_regex_init, om_regex_write, om_regex_flush, om_regex_close }, { "mysql", om_mysql_init, om_mysql_write, NULL, om_mysql_close }, { "pgsql", om_pgsql_init, om_pgsql_write, om_pgsql_flush, om_pgsql_close }, |
Update of /cvsroot/msyslog/syslog/src/modules In directory sc8-pr-cvs1:/tmp/cvs-serv10864/src/modules Modified Files: im_bsd.c im_doors.c im_file.c im_linux.c im_serial.c im_streams.c im_tcp.c im_udp.c im_unix.c om_classic.c om_directory.c om_mysql.c om_oracle8i.c om_pgsql.c om_queue.c om_refract.c om_regex.c om_snmptrap.c om_tcp.c om_udp.c Log Message: use typedefs now Index: im_bsd.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_bsd.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- im_bsd.c 5 Jun 2003 16:12:20 -0000 1.94 +++ im_bsd.c 16 Jun 2003 19:18:39 -0000 1.95 @@ -62,7 +62,7 @@ int -im_bsd_init(struct i_module *im, char **argv, int argc) +im_bsd_init(i_module_t *im, char **argv, int argc) { /* @@ -89,7 +89,7 @@ */ int -im_bsd_read(struct i_module *im, int infd, struct m_msg *m) +im_bsd_read(i_module_t *im, int infd, m_msg_t *m) { int r, mcount, cnt; @@ -166,7 +166,7 @@ } int -im_bsd_close (struct i_module *im) +im_bsd_close (i_module_t *im) { unwatch_fd_input('p', im->fd); Index: im_doors.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_doors.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- im_doors.c 17 Sep 2002 05:20:27 -0000 1.16 +++ im_doors.c 16 Jun 2003 19:18:39 -0000 1.17 @@ -66,7 +66,7 @@ */ int -im_doors_init(struct i_module *I, char **argv, int argc) +im_doors_init(i_module_t *I, char **argv, int argc) { char *door_path = DEFAULT_DOOR; int fd; Index: im_file.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_file.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- im_file.c 23 Apr 2003 20:01:43 -0000 1.13 +++ im_file.c 16 Jun 2003 19:18:39 -0000 1.14 @@ -67,7 +67,7 @@ */ int -im_file_init(struct i_module *im, char **argv, int argc) +im_file_init(i_module_t *im, char **argv, int argc) { struct im_file_ctx *c; int ch, argcnt; @@ -146,7 +146,7 @@ * 1: read the file, call im_file_read */ int -im_file_poll(struct i_module *im) +im_file_poll(i_module_t *im) { struct stat new_stat; struct im_file_ctx *c = (struct im_file_ctx *) (im->ctx); @@ -197,7 +197,7 @@ */ int -im_file_read(struct i_module *im, int infd, struct m_msg *m) +im_file_read(i_module_t *im, int infd, m_msg_t *m) { struct im_file_ctx *c; int cnt, r, mcount; @@ -273,7 +273,7 @@ */ int -im_file_close( struct i_module *im) +im_file_close( i_module_t *im) { FREE_PTR(im->ctx); CLOSE_FD(im->fd); Index: im_linux.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_linux.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- im_linux.c 11 Jun 2003 19:42:23 -0000 1.61 +++ im_linux.c 16 Jun 2003 19:18:39 -0000 1.62 @@ -153,7 +153,7 @@ * Initialize linux input module */ int -im_linux_init (struct i_module *I, char **argv, int argc) +im_linux_init (i_module_t *I, char **argv, int argc) { int ch; int argcnt; @@ -267,7 +267,7 @@ * and log it. */ int -im_linux_read (struct i_module *im, int infd, struct m_msg *m) +im_linux_read (i_module_t *im, int infd, m_msg_t *m) { char buf[MAXLINE]; struct im_linux_ctx *c; @@ -357,7 +357,7 @@ * Close linux input module */ int -im_linux_close (struct i_module *im) +im_linux_close (i_module_t *im) { ksym_close(); Index: im_serial.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_serial.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- im_serial.c 23 Apr 2003 18:41:36 -0000 1.6 +++ im_serial.c 16 Jun 2003 19:18:39 -0000 1.7 @@ -69,7 +69,7 @@ */ int -im_serial_init(struct i_module *im, char **argv, int argc) +im_serial_init(i_module_t *im, char **argv, int argc) { struct im_serial_ctx *c; int ch, argcnt; @@ -155,7 +155,7 @@ */ int -im_serial_read(struct i_module *im, int infd, struct m_msg *m) +im_serial_read(i_module_t *im, int infd, m_msg_t *m) { #ifdef IGNORE_PIPES RETSIGTYPE (*sigsave)(int); @@ -239,7 +239,7 @@ */ int -im_serial_close( struct i_module *im) +im_serial_close( i_module_t *im) { struct im_serial_ctx *c = (struct im_serial_ctx *) (im->ctx); Index: im_streams.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_streams.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- im_streams.c 23 Apr 2003 18:41:37 -0000 1.23 +++ im_streams.c 16 Jun 2003 19:18:40 -0000 1.24 @@ -68,7 +68,7 @@ */ int -im_streams_init (struct i_module *I, char **argv, int argc) +im_streams_init (i_module_t *I, char **argv, int argc) { m_dprintf(MSYSLOG_INFORMATIVE, "im_streams_init: Entering\n"); @@ -124,7 +124,7 @@ */ int -im_streams_read (struct i_module *im, int infd, struct im_msg *ret) +im_streams_read (i_module_t *im, int infd, struct im_msg *ret) { struct strbuf ctl, dat; struct log_ctl lc; @@ -210,7 +210,7 @@ * the following function is not mandatory, you can omit it */ int -im_streams_close (struct i_module *im) +im_streams_close (i_module_t *im) { struct im_streams_ctx *c = (im_streams_ctx *) im->ctx; Index: im_tcp.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_tcp.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- im_tcp.c 23 Apr 2003 18:41:37 -0000 1.49 +++ im_tcp.c 16 Jun 2003 19:18:40 -0000 1.50 @@ -111,7 +111,7 @@ */ int -im_tcp_init(struct i_module *I, char **argv, int argc) +im_tcp_init(i_module_t *I, char **argv, int argc) { struct im_tcp_ctx *c; char *host, *port; @@ -202,7 +202,7 @@ */ int -im_tcp_read(struct i_module *im, int infd, struct m_msg *m) +im_tcp_read(i_module_t *im, int infd, m_msg_t *m) { struct im_tcp_ctx *c; struct tcp_conn *con; @@ -336,7 +336,7 @@ */ int -im_tcp_close(struct i_module *im) +im_tcp_close(i_module_t *im) { struct im_tcp_ctx *c; struct tcp_conn *con, *cnext; Index: im_udp.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_udp.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- im_udp.c 23 Apr 2003 20:01:43 -0000 1.85 +++ im_udp.c 16 Jun 2003 19:18:40 -0000 1.86 @@ -78,7 +78,7 @@ */ int -im_udp_init(struct i_module *im, char **argv, int argc) +im_udp_init(i_module_t *im, char **argv, int argc) { char *host, *port; int ch, argcnt; @@ -151,7 +151,7 @@ */ int -im_udp_read(struct i_module *im, int infd, struct m_msg *m) +im_udp_read(i_module_t *im, int infd, m_msg_t *m) { int r, cnt, mcount; @@ -202,7 +202,7 @@ } int -im_udp_close(struct i_module *im) +im_udp_close(i_module_t *im) { CLOSE_FD(im->fd); Index: im_unix.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/im_unix.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- im_unix.c 23 Apr 2003 20:20:52 -0000 1.61 +++ im_unix.c 16 Jun 2003 19:18:40 -0000 1.62 @@ -69,7 +69,7 @@ */ int -im_unix_init(struct i_module *im, char **argv, int argc) +im_unix_init(i_module_t *im, char **argv, int argc) { struct sockaddr_un sunx; char *logger; @@ -113,7 +113,7 @@ */ int -im_unix_read(struct i_module *im, int infd, struct m_msg *m) +im_unix_read(i_module_t *im, int infd, m_msg_t *m) { struct sockaddr_un fromunix; int slen, r, c, mcount; @@ -180,7 +180,7 @@ */ int -im_unix_close( struct i_module *im) +im_unix_close( i_module_t *im) { CLOSE_FD(im->fd); Index: om_classic.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_classic.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- om_classic.c 20 May 2003 05:23:42 -0000 1.97 +++ om_classic.c 16 Jun 2003 19:18:40 -0000 1.98 @@ -110,7 +110,7 @@ int f_type; /* entry type, see below */ }; -void wallmsg (struct filed *, struct iovec *, struct om_classic_ctx *c); +void wallmsg (filed_t *, struct iovec *, struct om_classic_ctx *c); char *ttymsg(struct iovec *, int , char *, int); struct sockaddr *resolv_name(char *, char *, char *, size_t *); @@ -120,7 +120,7 @@ */ int -om_classic_write(struct filed *f, struct m_msg *m, void *ctx) +om_classic_write(filed_t *f, m_msg_t *m, void *ctx) { struct iovec iov[6]; struct iovec *v; @@ -291,8 +291,8 @@ om_classic_init( int argc, char **argv, - struct filed *f, - struct global *global, + filed_t *f, + m_global_t *global, void **ctx, char **status) { @@ -467,7 +467,7 @@ } int -om_classic_close(struct filed *f, void *ctx) +om_classic_close(filed_t *f, void *ctx) { struct om_classic_ctx *c; @@ -479,7 +479,7 @@ } int -om_classic_flush(struct filed *f, void *ctx) +om_classic_flush(filed_t *f, void *ctx) { /* flush any pending output */ if (f->prevcount) @@ -495,7 +495,7 @@ * world, or a list of approved users. */ void -wallmsg( struct filed *f, struct iovec *iov, struct om_classic_ctx *c) +wallmsg( filed_t *f, struct iovec *iov, struct om_classic_ctx *c) { static int reenter; /* avoid calling ourselves */ FILE *uf; Index: om_directory.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_directory.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- om_directory.c 23 Apr 2003 18:42:30 -0000 1.7 +++ om_directory.c 16 Jun 2003 19:18:40 -0000 1.8 @@ -101,8 +101,8 @@ int om_directory_write( - /* Current filed struct */ struct filed* fil, - /* The message string */ struct m_msg* msg, + /* Current filed struct */ filed_t* fil, + /* The message string */ m_msg_t* msg, /* Our context */ void* context) { @@ -173,8 +173,8 @@ om_directory_init ( int argc, /* Argumemt count */ char* *argv, /* Argumemt array, like main() */ - struct filed* f, /* Our filed structure */ - struct global* global, /* Global variables */ + filed_t* f, /* Our filed structure */ + m_global_t* global, /* Global variables */ void* *context, /* Our context */ char* *status) /* status */ { @@ -310,7 +310,7 @@ * -1 BAD */ int -om_directory_close (struct filed *f, void *context) { +om_directory_close (filed_t *f, void *context) { /* struct om_directory_context *ctx = (struct om_directory_context *) context; */ m_dprintf(MSYSLOG_INFORMATIVE, "om_directory_close: Not implemented\n"); return (1); @@ -323,7 +323,7 @@ * -1 BAD */ int -om_directory_flush (struct filed *f, void *context) { +om_directory_flush (filed_t *f, void *context) { /* struct om_directory_context *ctx = (struct om_directory_context *) context; */ m_dprintf(MSYSLOG_INFORMATIVE, "om_directory_flush: Not implemented\n"); return (1); Index: om_mysql.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_mysql.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- om_mysql.c 4 Jun 2003 18:30:56 -0000 1.92 +++ om_mysql.c 16 Jun 2003 19:18:40 -0000 1.93 @@ -95,7 +95,7 @@ #define OM_MYSQL_FACILITY 0x4 #define OM_MYSQL_PRIORITY 0x8 -int om_mysql_close(struct filed *, void *); +int om_mysql_close(filed_t *, void *); /* * Define our prototypes for MySQL functions @@ -136,7 +136,7 @@ } int -om_mysql_write(struct filed *f, struct m_msg *m, void *ctx) +om_mysql_write(filed_t *f, m_msg_t *m, void *ctx) { struct om_mysql_ctx *c; char query[MAX_QUERY], err_buf[100]; @@ -287,8 +287,8 @@ om_mysql_init( int argc, char **argv, - struct filed *f, - struct global *global, + filed_t *f, + m_global_t *global, void **c, char **status) { @@ -406,7 +406,7 @@ int -om_mysql_close(struct filed *f, void *ctx) +om_mysql_close(filed_t *f, void *ctx) { struct om_mysql_ctx *c; Index: om_oracle8i.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_oracle8i.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- om_oracle8i.c 4 Jun 2003 17:19:41 -0000 1.5 +++ om_oracle8i.c 16 Jun 2003 19:18:40 -0000 1.6 @@ -168,10 +168,10 @@ static int prepare_query(struct om_oracle8i_ctx *ctx); -int om_oracle8i_close(struct filed *, void *); +int om_oracle8i_close(filed_t *, void *); int -om_oracle8i_write(struct filed *f, struct m_msg *m, void *ctx) +om_oracle8i_write(filed_t *f, m_msg_t *m, void *ctx) { struct om_oracle8i_ctx *c; /* These should be preserved between calls, so they can be reused. */ @@ -294,7 +294,7 @@ */ int -om_oracle8i_init(int argc, char **argv, struct filed *f, char *prog, void **c, +om_oracle8i_init(int argc, char **argv, filed_t *f, char *prog, void **c, char **status) { struct om_oracle8i_ctx *ctx; @@ -380,7 +380,7 @@ } int -om_oracle8i_close(struct filed *f, void *ctx) +om_oracle8i_close(filed_t *f, void *ctx) { struct om_oracle8i_ctx *c = (struct om_oracle8i_ctx *) ctx; Index: om_pgsql.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_pgsql.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- om_pgsql.c 4 Jun 2003 17:19:41 -0000 1.57 +++ om_pgsql.c 16 Jun 2003 19:18:40 -0000 1.58 @@ -133,8 +133,8 @@ om_pgsql_init( int argc, char **argv, - struct filed *f, - struct global *global, + filed_t *f, + m_global_t *global, void **c, char **status) { @@ -281,7 +281,7 @@ */ int -om_pgsql_write(struct filed *f, struct m_msg *m, void *ctx) +om_pgsql_write(filed_t *f, m_msg_t *m, void *ctx) { void *r; struct om_pgsql_ctx *c; @@ -414,13 +414,13 @@ /* * a place holder for flushing the output file descriptor */ -int om_pgsql_flush(struct filed *f, void *ctx) { return (1); } +int om_pgsql_flush(filed_t *f, void *ctx) { return (1); } /* * release all resources including closing the file descriptor */ int -om_pgsql_close(struct filed *f, void *ctx) { +om_pgsql_close(filed_t *f, void *ctx) { struct om_pgsql_ctx *c; c = (struct om_pgsql_ctx *) ctx; Index: om_queue.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_queue.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- om_queue.c 9 May 2003 14:38:35 -0000 1.10 +++ om_queue.c 16 Jun 2003 19:18:40 -0000 1.11 @@ -172,8 +172,8 @@ int om_queue_write( - /* Current filed struct */ struct filed* fil, - /* The message string */ struct m_msg* msg, + /* Current filed struct */ filed_t* fil, + /* The message string */ m_msg_t* msg, /* Our context */ void* context) { struct om_queue_context *ctx; @@ -312,8 +312,8 @@ om_queue_init ( int argc, /* Argumemt count */ char* *argv, /* Argumemt array, like main() */ - struct filed* f, /* Our filed structure */ - struct global* global, /* Global variable */ + filed_t* f, /* Our filed structure */ + m_global_t* global, /* Global variable */ void* *context, /* Our context */ char* *status) /* status */ { @@ -542,7 +542,7 @@ * -1 BAD */ int -om_queue_close (struct filed *f, void *context) { +om_queue_close (filed_t *f, void *context) { /* struct om_queue_context *ctx = (struct om_queue_context *) context; */ m_dprintf(MSYSLOG_INFORMATIVE, "om_queue_close: Not implemented\n"); return (1); @@ -555,7 +555,7 @@ * -1 BAD */ int -om_queue_flush (struct filed *f, void *context) { +om_queue_flush (filed_t *f, void *context) { /* struct om_queue_context *ctx = (struct om_queue_context *) context; */ m_dprintf(MSYSLOG_INFORMATIVE, "om_queue_flush: Not implemented\n"); return (1); Index: om_refract.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_refract.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- om_refract.c 23 Apr 2003 18:42:32 -0000 1.9 +++ om_refract.c 16 Jun 2003 19:18:40 -0000 1.10 @@ -67,8 +67,8 @@ om_refract_init( int argc, /* Argumemt count */ char* *argv, /* Argumemt array, like main() */ - struct filed* f, /* Our filed structure */ - struct global* global, /* Global variable */ + filed_t* f, /* Our filed structure */ + m_global_t* global, /* Global variable */ void* *context, /* Our context */ char* *status) /* status */ { @@ -181,8 +181,8 @@ int om_refract_write( - /* Current filed struct */ struct filed* fil, - /* The message string */ struct m_msg* msg, + /* Current filed struct */ filed_t* fil, + /* The message string */ m_msg_t* msg, /* Our context */ void* context ) { @@ -235,7 +235,7 @@ */ int -om_refract_close (struct filed *f, void *context) { +om_refract_close (filed_t *f, void *context) { /* struct om_refract_context *ctx = (struct om_refract_context *) context; */ m_dprintf(MSYSLOG_INFORMATIVE, "om_refract_close: Not implemented\n"); return (1); @@ -248,7 +248,7 @@ -1 BAD */ int -om_refract_flush (struct filed *f, void *context) { +om_refract_flush (filed_t *f, void *context) { /* struct om_refract_context *ctx = (struct om_refract_context *) context; */ m_dprintf(MSYSLOG_INFORMATIVE, "om_refract_flush: Not implemented\n"); return (1); Index: om_regex.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_regex.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- om_regex.c 23 Apr 2003 18:42:33 -0000 1.53 +++ om_regex.c 16 Jun 2003 19:18:40 -0000 1.54 @@ -108,8 +108,8 @@ int om_regex_init( int argc, char **argv, - struct filed *f, - struct global* global, + filed_t *f, + m_global_t* global, void **ctx, char **status ) { @@ -410,7 +410,7 @@ 0 nomatch -> stop logging it */ -int om_regex_write(struct filed *f, struct m_msg *m, void *ctx) +int om_regex_write(filed_t *f, m_msg_t *m, void *ctx) { struct om_regex_ctx *c; int i, iflag; @@ -508,7 +508,7 @@ } -int om_regex_flush(struct filed *f, void *ctx) { +int om_regex_flush(filed_t *f, void *ctx) { return (1); } @@ -517,7 +517,7 @@ /* * Free the compiled regex */ -int om_regex_close(struct filed *f, void *ctx) { +int om_regex_close(filed_t *f, void *ctx) { struct om_regex_ctx *c; Index: om_snmptrap.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_snmptrap.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- om_snmptrap.c 23 Apr 2003 18:42:33 -0000 1.3 +++ om_snmptrap.c 16 Jun 2003 19:18:40 -0000 1.4 @@ -111,7 +111,7 @@ * will be the syslog message. */ int -om_snmptrap_init(int argc, char **argv, struct filed *f, char *prog, void **ctx, +om_snmptrap_init(int argc, char **argv, filed_t *f, char *prog, void **ctx, char **status) { extern int optreset; /* Present on some BSD based systems */ @@ -265,14 +265,14 @@ int -om_snmptrap_close(struct filed *f, void *ctx) +om_snmptrap_close(filed_t *f, void *ctx) { return (0); } int -om_snmptrap_write(struct filed *f, struct m_msg *msg, void *ctx) +om_snmptrap_write(filed_t *f, m_msg_t *msg, void *ctx) { struct snmp_session session, *ss; struct sockaddr_in *agent_addr; Index: om_tcp.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_tcp.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- om_tcp.c 23 Apr 2003 18:42:33 -0000 1.30 +++ om_tcp.c 16 Jun 2003 19:18:40 -0000 1.31 @@ -79,7 +79,7 @@ #define M_ADDHOST 0x01 int connect_tcp(char *, char *); -int om_tcp_close(struct filed *, void *); +int om_tcp_close(filed_t *, void *); /* * INIT -- Initialize om_tcp @@ -100,8 +100,8 @@ om_tcp_init( int argc, char **argv, - struct filed *f, - struct global *global, + filed_t *f, + m_global_t *global, void **ctx, char **status) { @@ -186,7 +186,7 @@ */ int -om_tcp_write(struct filed *f, struct m_msg *m, void *ctx) +om_tcp_write(filed_t *f, m_msg_t *m, void *ctx) { struct om_tcp_ctx *c; RETSIGTYPE (*sigsave)(int); @@ -320,7 +320,7 @@ */ int -om_tcp_close(struct filed *f, void *ctx) +om_tcp_close(filed_t *f, void *ctx) { struct om_tcp_ctx *c; Index: om_udp.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules/om_udp.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- om_udp.c 23 Apr 2003 18:42:34 -0000 1.8 +++ om_udp.c 16 Jun 2003 19:18:40 -0000 1.9 @@ -94,8 +94,8 @@ om_udp_init( int argc, char **argv, - struct filed *f, - struct global* global, + filed_t *f, + m_global_t* global, void **ctx, char **status) { @@ -168,7 +168,7 @@ */ int -om_udp_write(struct filed *f, struct m_msg *m, void *ctx) +om_udp_write(filed_t *f, m_msg_t *m, void *ctx) { struct om_udp_ctx *c; char time_buf[16]; @@ -217,7 +217,7 @@ */ int -om_udp_close(struct filed *f, void *ctx) +om_udp_close(filed_t *f, void *ctx) { struct om_udp_ctx *c; |
From: <al...@us...> - 2003-06-16 19:18:50
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv10864/src Modified Files: modules.c modules.h syslogd.c syslogd.h Log Message: use typedefs now Index: modules.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.c,v retrieving revision 1.175 retrieving revision 1.176 diff -u -d -r1.175 -r1.176 --- modules.c 22 May 2003 06:57:38 -0000 1.175 +++ modules.c 16 Jun 2003 19:18:39 -0000 1.176 @@ -66,98 +66,98 @@ extern int Debug; -int om_classic_init (int, char **, struct filed *, struct global*, void **, char **); -int om_tcp_init (int, char **, struct filed *, struct global*, void **, char **); -int om_udp_init (int, char **, struct filed *, struct global*, void **, char **); -int om_peo_init (int, char **, struct filed *, struct global*, void **, char **); -int om_regex_init (int, char **, struct filed *, struct global*, void **, char **); -int om_mysql_init (int, char **, struct filed *, struct global*, void **, char **); -int om_pgsql_init (int, char **, struct filed *, struct global*, void **, char **); -int om_classic_write (struct filed *, struct m_msg *, void *); -int om_tcp_write (struct filed *, struct m_msg *, void *); -int om_udp_write (struct filed *, struct m_msg *, void *); -int om_peo_write (struct filed *, struct m_msg *, void *); -int om_regex_write (struct filed *, struct m_msg *, void *); -int om_mysql_write (struct filed *, struct m_msg *, void *); -int om_pgsql_write (struct filed *, struct m_msg *, void *); -int om_classic_flush (struct filed *, void *); -int om_regex_flush (struct filed *, void *); -int om_pgsql_flush (struct filed *, void *); -int om_classic_close (struct filed *, void *); -int om_tcp_close (struct filed *, void *); -int om_udp_close (struct filed *, void *); -int om_peo_close (struct filed *, void *); -int om_regex_close (struct filed *, void *); -int om_mysql_close (struct filed *, void *); -int om_pgsql_close (struct filed *, void *); +int om_classic_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_tcp_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_udp_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_peo_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_regex_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_mysql_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_pgsql_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_classic_write (filed_t *, m_msg_t *, void *); +int om_tcp_write (filed_t *, m_msg_t *, void *); +int om_udp_write (filed_t *, m_msg_t *, void *); +int om_peo_write (filed_t *, m_msg_t *, void *); +int om_regex_write (filed_t *, m_msg_t *, void *); +int om_mysql_write (filed_t *, m_msg_t *, void *); +int om_pgsql_write (filed_t *, m_msg_t *, void *); +int om_classic_flush (filed_t *, void *); +int om_regex_flush (filed_t *, void *); +int om_pgsql_flush (filed_t *, void *); +int om_classic_close (filed_t *, void *); +int om_tcp_close (filed_t *, void *); +int om_udp_close (filed_t *, void *); +int om_peo_close (filed_t *, void *); +int om_regex_close (filed_t *, void *); +int om_mysql_close (filed_t *, void *); +int om_pgsql_close (filed_t *, void *); #ifdef HAVE_ORACLE8I_OMODULE -int om_oracle8i_init (int, char **, struct filed *, struct global*, void **, char **); -int om_oracle8i_write (struct filed *, struct m_msg *, void *); -int om_oracle8i_close (struct filed *, void *); +int om_oracle8i_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_oracle8i_write (filed_t *, m_msg_t *, void *); +int om_oracle8i_close (filed_t *, void *); #endif #ifdef HAVE_SNMPTRAP_OMODULE -int om_snmptrap_init (int, char **, struct filed *, struct global*, void **, char **); -int om_snmptrap_write (struct filed *, struct m_msg *, void *); -int om_snmptrap_close (struct filed *, void *); +int om_snmptrap_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_snmptrap_write (filed_t *, m_msg_t *, void *); +int om_snmptrap_close (filed_t *, void *); #endif #ifdef HAVE_QUEUE_OMODULE -int om_directory_init (int, char **, struct filed *, struct global*, void **, char **); -int om_queue_init (int, char **, struct filed *, struct global*, void **, char **); -int om_directory_write (struct filed *, struct m_msg *, void *); -int om_queue_write (struct filed *, struct m_msg *, void *); -int om_directory_flush (struct filed *, void *); -int om_queue_flush (struct filed *, void *); -int om_directory_close (struct filed *, void *); -int om_queue_close (struct filed *, void *); +int om_directory_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_queue_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_directory_write (filed_t *, m_msg_t *, void *); +int om_queue_write (filed_t *, m_msg_t *, void *); +int om_directory_flush (filed_t *, void *); +int om_queue_flush (filed_t *, void *); +int om_directory_close (filed_t *, void *); +int om_queue_close (filed_t *, void *); #endif #ifdef HAVE_REFRACT_OMODULE -int om_refract_init (int, char **, struct filed *, struct global*, void **, char **); -int om_refract_write (struct filed *, struct m_msg *, void *); -int om_refract_flush (struct filed *, void *); -int om_refract_close (struct filed *, void *); +int om_refract_init (int, char **, filed_t *, m_global_t *, void **, char **); +int om_refract_write (filed_t *, m_msg_t *, void *); +int om_refract_flush (filed_t *, void *); +int om_refract_close (filed_t *, void *); #endif #ifdef HAVE_BSD_IMODULE -int im_bsd_init (struct i_module *, char **, int); -int im_bsd_read (struct i_module *, int, struct m_msg *); -int im_bsd_close (struct i_module *); /* close input, optional */ +int im_bsd_init (i_module_t *, char **, int); +int im_bsd_read (i_module_t *, int, m_msg_t *); +int im_bsd_close (i_module_t *); /* close input, optional */ #endif #ifdef HAVE_LINUX_IMODULE -int im_linux_init (struct i_module *, char **, int); -int im_linux_read (struct i_module *, int, struct m_msg *); -int im_linux_close (struct i_module *); /* close input, optional */ +int im_linux_init (i_module_t *, char **, int); +int im_linux_read (i_module_t *, int, m_msg_t *); +int im_linux_close (i_module_t *); /* close input, optional */ #endif #ifdef HAVE_UNIX_IMODULE -int im_unix_init (struct i_module *, char **, int); -int im_unix_read (struct i_module *, int, struct m_msg *); -int im_unix_close (struct i_module *); /* close input, optional */ +int im_unix_init (i_module_t *, char **, int); +int im_unix_read (i_module_t *, int, m_msg_t *); +int im_unix_close (i_module_t *); /* close input, optional */ #endif #ifdef HAVE_STREAMS_IMODULE -int im_streams_init (struct i_module *, char **, int); -int im_streams_read (struct i_module *, int, struct m_msg *); -int im_streams_close (struct i_module *); /* close input, optional */ +int im_streams_init (i_module_t *, char **, int); +int im_streams_read (i_module_t *, int, m_msg_t *); +int im_streams_close (i_module_t *); /* close input, optional */ #endif #ifdef HAVE_SERIAL_IMODULE -int im_serial_init (struct i_module *, char **, int); -int im_serial_read (struct i_module *, int, struct m_msg *); -int im_serial_close (struct i_module *); /* close input, optional */ +int im_serial_init (i_module_t *, char **, int); +int im_serial_read (i_module_t *, int, m_msg_t *); +int im_serial_close (i_module_t *); /* close input, optional */ #endif -int im_file_init (struct i_module *, char **, int); -int im_file_read (struct i_module *, int, struct m_msg *); -int im_file_close (struct i_module *); /* close input, optional */ -int im_file_poll (struct i_module *); -int im_tcp_init (struct i_module *, char **, int); -int im_tcp_read (struct i_module *, int, struct m_msg *); -int im_tcp_close (struct i_module *); /* close input, optional */ -int im_udp_init (struct i_module *, char **, int); -int im_udp_read (struct i_module *, int, struct m_msg *); -int im_udp_close (struct i_module *); /* close input, optional */ +int im_file_init (i_module_t *, char **, int); +int im_file_read (i_module_t *, int, m_msg_t *); +int im_file_close (i_module_t *); /* close input, optional */ +int im_file_poll (i_module_t *); +int im_tcp_init (i_module_t *, char **, int); +int im_tcp_read (i_module_t *, int, m_msg_t *); +int im_tcp_close (i_module_t *); /* close input, optional */ +int im_udp_init (i_module_t *, char **, int); +int im_udp_read (i_module_t *, int, m_msg_t *); +int im_udp_close (i_module_t *); /* close input, optional */ -struct omodule omodules[] = { +omodule_t omodules[] = { { "classic", om_classic_init, om_classic_write, om_classic_flush, om_classic_close }, { "tcp", om_tcp_init, om_tcp_write, NULL, om_tcp_close }, { "udp", om_udp_init, om_udp_write, NULL, om_udp_close }, @@ -181,7 +181,7 @@ { NULL, NULL,NULL,NULL,NULL } }; -struct imodule imodules[] = { +imodule_t imodules[] = { #ifdef HAVE_BSD_IMODULE { "bsd", im_bsd_init, im_bsd_read, im_bsd_close, NULL }, #endif @@ -210,11 +210,11 @@ * 'line' is the command line of the input module */ int -imodule_create(struct i_module *I, char *line) +imodule_create(i_module_t *I, char *line) { int argc, i; char **argv = NULL; - struct i_module *im, *im_prev; + i_module_t *im, *im_prev; int ret = 1; /* create initial node for Inputs list */ @@ -225,8 +225,8 @@ im = im_prev; } else { - if ((im_prev->next = (struct i_module *)calloc(1, - sizeof(struct i_module))) == NULL) { + if ((im_prev->next = (i_module_t *)calloc(1, + sizeof(i_module_t))) == NULL) { m_dprintf(MSYSLOG_SERIOUS, "No memory available for " "calloc\n"); return (-1); @@ -301,12 +301,12 @@ * */ int -omodule_create(char *c, struct filed *f, struct global* global) +omodule_create(char *c, filed_t *f, m_global_t * global) { #define OMODULE_ARGV_MAX 20 char *line, *p, quotes, *argv[OMODULE_ARGV_MAX]; int argc, i; - struct o_module *om, *om_prev; + o_module_t *om, *om_prev; line = strdup(c); quotes = 0; p = line; @@ -314,16 +314,16 @@ /* create context and initialize module for logging */ while (*p) { if (f->omod == NULL) { - f->omod = (struct o_module *) - calloc(1, sizeof(struct o_module)); + f->omod = (o_module_t *) + calloc(1, sizeof(o_module_t)); om = f->omod; om_prev = NULL; } else { for (om_prev = f->omod; om_prev->next; om_prev = om_prev->next); - om_prev->next = (struct o_module *) - calloc(1, sizeof(struct o_module)); + om_prev->next = (o_module_t *) + calloc(1, sizeof(o_module_t)); om = om_prev->next; } Index: modules.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.h,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- modules.h 15 Jun 2003 01:14:22 -0000 1.56 +++ modules.h 16 Jun 2003 19:18:39 -0000 1.57 @@ -57,7 +57,7 @@ void *ctx; /* XXX: remove this */ char *status; -} o_module; +} o_module_t; /* * This structure represents main details for the input modules @@ -71,9 +71,9 @@ int blen; int flags; /* internal module flags */ void *ctx; -} i_module; +} i_module_t; -int watch_fd_input(char, int , i_module *); /* add this fd to poll array */ +int watch_fd_input(char, int , i_module_t *); /* add this fd to poll array */ void unwatch_fd_input(char, int); /* remove this fd from poll arrays */ #endif Index: syslogd.c =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.c,v retrieving revision 1.264 retrieving revision 1.265 diff -u -d -r1.264 -r1.265 --- syslogd.c 5 Jun 2003 16:10:57 -0000 1.264 +++ syslogd.c 16 Jun 2003 19:18:39 -0000 1.265 @@ -156,65 +156,64 @@ * in seconds after previous message is logged. After each flush, * we move to the next interval until we reach the largest. */ -int repeatinterval[] = {30, 120, 600}; /* # of secs before - * flush */ +int repeatinterval[] = {30, 120, 600}; /* # of secs before * flush */ -struct filed *Files; -struct filed consfile; +filed_t *Files; +filed_t consfile; -int Initialized = 0;/* set when we have initialized ourselves */ -int MarkInterval = 20 * 60; /* interval between marks in seconds */ -int MarkSeq = 0; /* mark sequence number */ -int WantDie = 0; -char *ConfFile = _PATH_MSYSLOG_CONF; /* configuration file */ +int Initialized = 0;/* set when we have initialized ourselves */ +int MarkInterval = 20 * 60; /* interval between marks in seconds */ +int MarkSeq = 0; /* mark sequence number */ +int WantDie = 0; +char *ConfFile = _PATH_MSYSLOG_CONF; /* configuration file */ #ifdef _PATH_LOGPID -char *pidfile = _PATH_LOGPID; +char *pidfile = _PATH_LOGPID; #else -char *pidfile = PID_DIR "/" PID_FILE; +char *pidfile = PID_DIR "/" PID_FILE; #endif -FILE *pidf; +FILE *pidf; #define MAX_PIDFILE_LOCK_TRIES 5 -char *ctty = "%classic -t CONSOLE " _PATH_CONSOLE; /* console path */ -int UseConsole = 1; -char LocalHostName[MAXHOSTNAMELEN]; /* our hostname */ -int Debug = 0; /* debug flag */ -int DaemonFlags = 0;/* running daemon flags */ -#define SYSLOGD_LOCKED_PIDFILE 0x01 /* pidfile is locked */ -#define SYSLOGD_MARK 0x02 /* call domark() */ -#define SYSLOGD_DIE 0x04 /* call die() */ -#define USE_LOCALDOMAIN 0x08 /* use hostname with local domain */ +char *ctty = "%classic -t CONSOLE " _PATH_CONSOLE; /* console path */ +int UseConsole = 1; +char LocalHostName[MAXHOSTNAMELEN]; /* our hostname */ +int Debug = 0; /* debug flag */ +int DaemonFlags = 0;/* running daemon flags */ +#define SYSLOGD_LOCKED_PIDFILE 0x01 /* pidfile is locked */ +#define SYSLOGD_MARK 0x02 /* call domark() */ +#define SYSLOGD_DIE 0x04 /* call die() */ +#define USE_LOCALDOMAIN 0x08 /* use hostname with local domain */ #define DONT_COLLAPSE 0x10 -char *libdir = NULL; -struct global globals = {NULL, NULL, NULL}; +char *libdir = NULL; +m_global_t globals = {NULL, NULL, NULL}; RETSIGTYPE domark(int); RETSIGTYPE reapchild(int); RETSIGTYPE init(int); RETSIGTYPE signal_handler(int); RETSIGTYPE dodie(int); -void die(int); -int cfline(char *, struct filed *, char *); -int decode(const char *, CODE *); -void markit(void); -void do_log(struct filed *, struct m_msg *); -int parse_lines(struct m_msg *, char *, size_t, int *); -void usage(void); -int imodule_create(struct i_module *, char *); -int omodule_create(char *, struct filed *, struct global *); -void logerror(char *); -void log_msgs(struct m_msg *); -int read_input(struct i_module *, int); +void die(int); +int cfline(char *, filed_t *, char *); +int decode(const char *, CODE *); +void markit(void); +void do_log(filed_t *, m_msg_t *); +int parse_lines(m_msg_t *, char *, size_t, int *); +void usage(void); +int imodule_create(i_module_t *, char *); +int omodule_create(char *, filed_t *, m_global_t *); +void logerror(char *); +void log_msgs(m_msg_t *); +int read_input(i_module_t *, int); -int resolv_domain(char *, int, char *); +int resolv_domain(char *, int, char *); -struct i_module Inputs; +i_module_t Inputs; /* * These three variables work in conjunction "poll_fd" is an array used by @@ -223,17 +222,24 @@ */ struct pollfd *poll_fd = NULL; /* an array of pollfd */ -struct i_module **poll_fd_modules = NULL; /* an array of pointers */ -int poll_fd_cnt = 0; +i_module_t **poll_fd_modules = NULL; /* an array of pointers */ +int poll_fd_cnt = 0; -int *unpoll_fd = NULL; /* an array of pollfd */ -struct i_module **unpoll_fd_modules = NULL; /* an array of pointers */ -int unpoll_fd_cnt = 0; +int *unpoll_fd = NULL; /* an array of pollfd */ +i_module_t **unpoll_fd_modules = NULL; /* an array of pointers */ +int unpoll_fd_cnt = 0; -struct m_msg *msg_list = NULL; +m_msg_t *msg_list = NULL; uint32_t msg_count = 0; uint32_t msg_save_max = 50; +/* fast hex to char conversion, to avoid printf */ +char hex_vals[] = "0123456789abcdef"; /* fijate si lo queres en minusculas */ +#define CONV_BIN2HEX(b,h,l) { \ + l = (hex_vals[b & 0x0f]) ; \ + h = (hex_vals[(b & 0xf0) >> 4]) ; \ + } + /* * main: @@ -246,35 +252,38 @@ #ifndef SIGALTSTACK_WITH_STACK_T struct sigaltstack alt_stack; #else - stack_t alt_stack; + stack_t alt_stack; #endif struct sigaction sa; - int ch; - int argcnt; - int default_inputs = 1; /* start default modules? */ + char *method; + int ch; + int argcnt; + int default_inputs = 1; /* start default modules? */ Inputs.next = NULL; Inputs.fd = -1; + method = "sha1"; + setlinebuf(stdout); /* - * Daemon options - * - * -d -debug <level> - * -i -input [input module name and args] - * -f -conf [configuration file] - * -P -pidfile [pid file] - * -m -markinterval [mark interval seconds] - * -c -noconsole - * -A -uselocaldomain - * -n -nodefault - * -C -nocollapse - * - * legacy options - * -u -unix - * -p -path -a [additional unix input module in /dev/log] - */ + * Daemon options + * + * -d -debug <level> + * -i -input [input module name and args] + * -f -conf [configuration file] + * -P -pidfile [pid file] + * -m -markinterval [mark interval seconds] + * -c -noconsole + * -A -uselocaldomain + * -n -nodefault + * -C -nocollapse + * + * legacy options + * -u -unix + * -p -path -a [additional unix input module in /dev/log] + */ /* * XXX: this should be sorted alphabetically (string and case) @@ -282,9 +291,9 @@ for (argcnt = 1; (ch = getxopt(argc, argv, " d!debug: i!input: " "f!conf: m!markinterval: P!pidfile: c!console A!localdomain " - "n!nodefault C!nocollapse h!help u!udp p!path a!add s!savemsgs:", - &argcnt)) != -1; argcnt++) { - char buf[512]; + "n!nodefault C!nocollapse h!help u!udp p!path a!add s!savemsgs:" + " H!method:", &argcnt)) != -1; argcnt++) { + char buf[512]; switch (ch) { case 'd': /* debug */ @@ -338,6 +347,10 @@ case 'C': DaemonFlags |= DONT_COLLAPSE; break; + case 'H': + method = optarg; + break; + case 's': msg_save_max = strtol(argv[argcnt], NULL, 10); break; @@ -398,7 +411,7 @@ } } if (!Debug) { - int fd; + int fd; /* go daemon and mimic daemon() */ switch (fork()) { @@ -470,8 +483,8 @@ /* took my process id away */ if (!Debug) { struct flock fl; - int lfd, tries, status; - char buf[1024]; + int lfd, tries, status; + char buf[1024]; fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; /* relative to bof */ @@ -562,8 +575,8 @@ * for an event on any of those file descriptors. */ for (;;) { - int count, ix; - int poll_timeout = 5000; /* milliseconds */ + int count, ix; + int poll_timeout = 5000; /* milliseconds */ if (DaemonFlags & SYSLOGD_MARK) markit(); @@ -587,7 +600,7 @@ /* timeout */ case 0: for (ix = 0; ix < unpoll_fd_cnt; ix++) { - struct i_module *current = unpoll_fd_modules[ix]; + i_module_t *current = unpoll_fd_modules[ix]; if (!current) { m_dprintf(MSYSLOG_SERIOUS, "syslogd: " @@ -618,7 +631,7 @@ default: m_dprintf(MSYSLOG_INFORMATIVE, "syslogd: [%d] poll events\n", count); for (ix = 0; ix < poll_fd_cnt || count < 1; ix++) { - struct i_module *current = poll_fd_modules[ix]; + i_module_t *current = poll_fd_modules[ix]; if (!current) { m_dprintf(MSYSLOG_SERIOUS, "syslogd: " @@ -648,10 +661,10 @@ */ int -read_input(struct i_module *im, int listen_fd) +read_input(i_module_t *im, int listen_fd) { - struct m_msg msg; /* avoid need to alloc first msg */ - struct m_msg *m; + m_msg_t msg; /* avoid need to alloc first msg */ + m_msg_t *m; int count; CLEAR_MSG(&msg); @@ -697,7 +710,7 @@ } void -add_host(struct m_msg *m) +add_host(m_msg_t *m) { /* add local host name */ strncpy(m->host, LocalHostName, sizeof (m->host) - 1); @@ -707,7 +720,7 @@ } void -set_date(struct m_msg *m) +set_date(m_msg_t *m) { time_t now; @@ -717,7 +730,7 @@ } void -set_tm(struct m_msg *m) +set_tm(m_msg_t *m) { m->vals[M_VAL_SEC] = m->tm.tm_sec; m->vals[M_VAL_MIN] = m->tm.tm_min; @@ -740,13 +753,13 @@ /* * parse_lines: * Get a sample msg structure, a buf with raw input, - * and parse it. Use as many m_msg structs as needed. + * and parse it. Use as many m_msg_t structs as needed. * Returns chars consumed from buf if messages were found. * Returns -1 if buf was exhausted without messages. */ int -parse_lines(struct m_msg *m, char *buf, size_t blen, int *count) +parse_lines(m_msg_t *m, char *buf, size_t blen, int *count) { char *p, *q; uint32_t fields, flags; @@ -917,7 +930,7 @@ /* are there remaining msgs to be parsed on this buf ? */ if (blen > b) { - /* fetch a new m_msg struct */ + /* fetch a new m_msg_t struct */ if ((m->next = get_mmsg()) == NULL) { m_dprintf(MSYSLOG_SERIOUS, "parse_lines: error getting" @@ -948,10 +961,10 @@ /* * make_log: - * makes simple m_msg and sends it + * makes simple m_msg_t and sends it */ void -make_log(struct m_msg *m, int pri, char *msg, char *host, int flags) +make_log(m_msg_t *m, int pri, char *msg, char *host, int flags) { CLEAR_MSG(m); @@ -994,11 +1007,11 @@ */ void -log_msgs(struct m_msg *m) +log_msgs(m_msg_t *m) { - register struct filed *f; - sigset_t mask, omask; - time_t now; + filed_t *f; + sigset_t mask, omask; + time_t now; sigemptyset(&mask); sigaddset(&mask, SIGALRM); @@ -1007,7 +1020,7 @@ sigprocmask(SIG_BLOCK, &mask, &omask); m_dprintf(MSYSLOG_INFORMATIVE, "log_msgs: pri 0%o, flags 0x%x, from " - "%s, msg %s\n", LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), + "%s, msg %s\n", LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), m->flags, m->host, m->msg); /* log the message to the particular outputs */ @@ -1054,8 +1067,8 @@ continue; /* - * suppress duplicate lines to this file - */ + * suppress duplicate lines to this file + */ if (!(DaemonFlags & DONT_COLLAPSE) && !(m->flags & M_FLAG_MARK) && m->mlen == f->prevmsg.mlen && !strcmp(m->msg, f->prevmsg.msg) && @@ -1067,11 +1080,11 @@ (long) (now - f->time), repeatinterval[f->repeatcount]); /* - * If domark would have logged this by now, - * flush it now (so we don't hold isolated messages), - * but back off so we'll flush less often - * in the future. - */ + * If domark would have logged this by now, + * flush it now (so we don't hold isolated messages), + * but back off so we'll flush less often + * in the future. + */ if (now > REPEATTIME(f)) { do_log(f, NULL); BACKOFF(f); @@ -1084,8 +1097,8 @@ do_log(f, NULL); /* - * Start counting again, save host data etc. - */ + * Start counting again, save host data etc. + */ f->prevcount = 0; f->repeatcount = 0; memcpy(&f->prevmsg, m, sizeof (f->prevmsg)); @@ -1104,14 +1117,14 @@ */ void -do_log(struct filed * f, struct m_msg *m) +do_log(filed_t * f, m_msg_t *m) { - struct m_msg repeatmsg; - struct o_module *om; + m_msg_t repeatmsg; + o_module_t *om; int ret; /* - * XXX: avoid m_msg variable + * XXX: avoid m_msg_t variable */ /* save time */ @@ -1143,9 +1156,9 @@ for (om = f->omod; om; om = om->next) { /* - * return code: - * The rule has "fired" if all its modules "fire". - */ + * return code: + * The rule has "fired" if all its modules "fire". + */ ret = (om->func->write) (f, m, om->ctx); @@ -1177,8 +1190,8 @@ RETSIGTYPE reapchild(int signo) { - int status; - int save_errno = errno; + int status; + int save_errno = errno; while (waitpid(-1, &status, WNOHANG) > 0); errno = save_errno; @@ -1199,9 +1212,9 @@ void markit(void) { - struct m_msg m; - struct filed *f; - time_t now; + m_msg_t m; + filed_t *f; + time_t now; time(&now); @@ -1238,8 +1251,8 @@ void logerror(char *type) { - struct m_msg m; - char buf[100]; + m_msg_t m; + char buf[100]; if (errno) snprintf(buf, sizeof(buf), "syslogd: %s: %s", @@ -1256,10 +1269,10 @@ void die(int signo) { - struct filed *f; - int was_initialized = Initialized; - char buf[100]; - struct i_module *im; + filed_t *f; + int was_initialized = Initialized; + char buf[100]; + i_module_t *im; Initialized = 0; /* Don't log SIGCHLDs */ @@ -1285,8 +1298,8 @@ CLOSE_FD(im->fd); if (!Debug && (DaemonFlags == SYSLOGD_LOCKED_PIDFILE)) { - struct flock fl; - int lfd; + struct flock fl; + int lfd; lfd = fileno(pidf); fl.l_type = F_UNLCK; @@ -1309,20 +1322,20 @@ RETSIGTYPE init(int signo) { - struct m_msg m; - int i; - FILE *cf; - struct filed *f, *fnext, **fnextp; - char *p; - char cline[LINE_MAX]; - char prog[NAME_MAX + 1]; - struct o_module *om, *omnext; + m_msg_t m; + FILE *cf; + int i; + filed_t *f, *fnext, **fnextp; + char *p; + char cline[LINE_MAX]; + char prog[NAME_MAX + 1]; + o_module_t *om, *omnext; m_dprintf(MSYSLOG_INFORMATIVE, "init\n"); /* - * Close all open log files. - */ + * Close all open log files. + */ Initialized = 0; @@ -1369,18 +1382,18 @@ /* open the configuration file */ if ((cf = fopen(ConfFile, "r")) == NULL) { m_dprintf(MSYSLOG_SERIOUS, "cannot open config: %s\n", ConfFile); - if ((*fnextp = (struct filed *) calloc(1, sizeof(*f))) + if ((*fnextp = (filed_t *) calloc(1, sizeof(*f))) == NULL) { - m_dprintf(MSYSLOG_CRITICAL, "calloc struct filed"); + m_dprintf(MSYSLOG_CRITICAL, "calloc filed_t"); exit(-1); } if (cfline("*.ERR\t/dev/console", *fnextp, "*") == -1) { m_dprintf(MSYSLOG_CRITICAL, "can't write to console"); exit(-1); } - if (((*fnextp)->next = (struct filed *) calloc(1, sizeof(*f))) + if (((*fnextp)->next = (filed_t *) calloc(1, sizeof(*f))) == NULL) { - m_dprintf(MSYSLOG_CRITICAL, "calloc struct filed"); + m_dprintf(MSYSLOG_CRITICAL, "calloc filed_t"); exit(-1); } if (cfline("*.PANIC\t*", (*fnextp)->next, "*") == -1) { @@ -1391,21 +1404,21 @@ return; } /* - * Foreach line in the conf table, open that file. - */ + * Foreach line in the conf table, open that file. + */ f = NULL; strncpy(prog, "*", 2); prog[sizeof(prog) - 1] = '\0'; while (fgets(cline, sizeof(cline), cf) != NULL) { - int clen; + int clen; /* - * check for end-of-section, comments, strip off trailing - * spaces and newline character. #!prog and !prog are treated - * specially: the following lines apply only to that program. - */ + * check for end-of-section, comments, strip off trailing + * spaces and newline character. #!prog and !prog are treated + * specially: the following lines apply only to that program. + */ for (p = cline; isspace((int) *p); ++p) continue; if (*p == '\0') @@ -1450,8 +1463,8 @@ break; } *p = '\0'; - if ((f = (struct filed *) calloc(1, sizeof(*f))) == NULL) { - m_dprintf(MSYSLOG_CRITICAL, "calloc struct filed"); + if ((f = (filed_t *) calloc(1, sizeof(*f))) == NULL) { + m_dprintf(MSYSLOG_CRITICAL, "calloc filed_t"); exit(-1); } if (cfline(cline, f, prog) == 1) { @@ -1502,13 +1515,13 @@ * Crack a configuration file line */ int -cfline(char *line, struct filed * f, char *prog) +cfline(char *line, filed_t * f, char *prog) { - register int i, j; - int pri, singlpri, ignorepri; - register char *p, *q; - char *bp; - char buf[MAXLINE + 1], ebuf[240]; + char buf[MAXLINE + 1], ebuf[240]; + char *p, *q; + char *bp; + int i, j; + int pri, singlpri, ignorepri; m_dprintf(MSYSLOG_INFORMATIVE, "cfline(\"%s\", f, \"%s\")\n", line, prog); @@ -1581,9 +1594,9 @@ return (-1); } /* - * Heavily modified to fit sysklogd - * This should be done with lex/yacc - */ + * Heavily modified to fit sysklogd + * This should be done with lex/yacc + */ /* scan facilities */ while (*p && !strchr("\t .;", *p)) { for (bp = buf; *p && !strchr("\t ,;.", *p);) @@ -1701,8 +1714,9 @@ int decode(const char *name, CODE * codetab) { - CODE *c; - char *p, buf[40]; + char buf[40]; + CODE *c; + char *p; if (isdigit((int) *name)) return (atoi(name)); @@ -1727,10 +1741,10 @@ /* * decode_name a numeric value to a symbolic name */ -char * +char * decode_val(int val, int codetab) { - CODE *c; + CODE *c; if (codetab == CODE_FACILITY) c = facilitynames; @@ -1752,11 +1766,11 @@ * grow by 50 * * params: fd file descriptor to watch - * im module functions and more + * im module functions and more */ int -watch_fd_input(char type, int fd, struct i_module * im) +watch_fd_input(char type, int fd, i_module_t * im) { if (fd < 0 || im == NULL) { m_dprintf(MSYSLOG_INFORMATIVE, "watch_fd_input: error on params" @@ -1781,9 +1795,9 @@ m_dprintf(MSYSLOG_CRITICAL, "realloc inputs: poll fd"); exit(-1); } - if ((poll_fd_modules = (struct i_module **) realloc( + if ((poll_fd_modules = (i_module_t **) realloc( poll_fd_modules, - (size_t) (poll_fd_cnt + 50) * sizeof(struct i_module *) + (size_t) (poll_fd_cnt + 50) * sizeof(i_module_t *) )) == NULL) { m_dprintf(MSYSLOG_CRITICAL, "realloc inputs: input modules"); exit(-1); @@ -1807,9 +1821,9 @@ m_dprintf(MSYSLOG_CRITICAL, "realloc inputs: unpoll fd"); exit(-1); } - if ((unpoll_fd_modules = (struct i_module **) realloc( + if ((unpoll_fd_modules = (i_module_t **) realloc( unpoll_fd_modules, - (size_t) (unpoll_fd_cnt + 50) * sizeof(struct i_module *) + (size_t) (unpoll_fd_cnt + 50) * sizeof(i_module_t *) )) == NULL) { m_dprintf(MSYSLOG_CRITICAL, "realloc inputs: input modules"); exit(-1); @@ -1827,7 +1841,7 @@ void unwatch_fd_input(char type, int fd) { - int ix; + int ix; m_dprintf(MSYSLOG_INFORMATIVE, "unwatch_fd_input: remove fd %d\n", fd); @@ -1906,8 +1920,8 @@ int m_dprintf(const int level, char const * fmt,...) { - int ret; - va_list var; + int ret; + va_list var; if (level >= Debug) return (1); @@ -1924,14 +1938,14 @@ * take a msg struct from available list, else alloc */ -struct m_msg * +m_msg_t * get_mmsg(void) { - struct m_msg *m; + m_msg_t *m; if (msg_list == NULL) { - m = (struct m_msg *) malloc(sizeof (*m)); + m = (m_msg_t *) malloc(sizeof (*m)); } else { @@ -1948,14 +1962,14 @@ /* * dispose_msgs - * Dispose struct m_msg + * Dispose m_msg_t * keep some on a list to avid constant alloc/free */ void -dispose_msgs(struct m_msg *msgs) +dispose_msgs(m_msg_t *msgs) { - struct m_msg *m; + m_msg_t *m; if (msgs == NULL) return; Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- syslogd.h 15 Jun 2003 01:14:22 -0000 1.124 +++ syslogd.h 16 Jun 2003 19:18:39 -0000 1.125 @@ -203,7 +203,7 @@ uint32_t hlen; /* host length */ uint32_t plen; /* program (name) length */ uint32_t ulen; /* user (name) length */ -} m_msg; +} m_msg_t; #define CLEAR_MSG(m) { (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \ (m)->msg[0] = '\0'; (m)->host[0] = '\0'; \ @@ -217,9 +217,9 @@ } } -m_msg *get_mmsg(void); -void dispose_msgs(m_msg *); -int parse_lines(m_msg *, char *, size_t, int *); +m_msg_t *get_mmsg(void); +void dispose_msgs(m_msg_t *); +int parse_lines(m_msg_t *, char *, size_t, int *); /* * This structure represents the line rules @@ -234,17 +234,17 @@ u_short pmask[LOG_NFACILITIES+1]; /* priority mask */ char program[MAX_PROGNAME_SIZE]; /* program name */ /* XXX: this should be some short hash instead */ - m_msg prevmsg; /* last message logged */ + m_msg_t prevmsg; /* last message logged */ int prevcount; /* repetition cnt of prevline */ int repeatcount; /* number of "repeated" msgs */ - o_module *omod; /* module details */ -} filed; + o_module_t *omod; /* module details */ +} filed_t; typedef struct m_global { char *prog; /* program name */ char *FileListing; /* File Listing */ FILE *flist_des; /* File Listing descriptor */ -} m_global; +} m_global_t; void logerror(char *); void logmsg(int, char *, char *, int); @@ -256,19 +256,19 @@ typedef struct omodule { char *name; - int (*init) (int, char **, filed *, m_ global *, void **, char **); - int (*write) (filed *, m_msg *, void *); - int (*flush) (filed *, void *); - int (*close) (filed *, void *); -} omodule; + int (*init) (int, char **, filed_t *, m_global_t *, void **, char **); + int (*write) (filed_t *, m_msg_t *, void *); + int (*flush) (filed_t *, void *); + int (*close) (filed_t *, void *); +} omodule_t; typedef struct imodule { char *name; - int (*init) (i_module *, char **, int); - int (*read) (i_module *, int, m_msg *); - int (*close) (i_module *); /* close input, optional */ - int (*poll) (i_module *); -} imodule; + int (*init) (i_module_t *, char **, int); + int (*read) (i_module_t *, int, m_msg_t *); + int (*close) (i_module_t *); /* close input, optional */ + int (*poll) (i_module_t *); +} imodule_t; #define MAXREPEAT ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1) @@ -332,7 +332,7 @@ typedef struct _code { char *c_name; int c_val; -} CODE; +} CODE_t; CODE prioritynames[] = { |
From: <al...@us...> - 2003-06-15 01:14:25
|
Update of /cvsroot/msyslog/syslog/src In directory sc8-pr-cvs1:/tmp/cvs-serv24081/src Modified Files: syslogd.h modules.h Log Message: use typedefs on structure definitions Index: syslogd.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/syslogd.h,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- syslogd.h 13 Jun 2003 19:37:28 -0000 1.123 +++ syslogd.h 15 Jun 2003 01:14:22 -0000 1.124 @@ -187,7 +187,7 @@ * It contains also the state information for a message. * */ -struct m_msg { +typedef struct m_msg { struct m_msg *next; uint32_t fields; /* active fields in this msg */ uint32_t flags; /* module flags */ @@ -203,7 +203,7 @@ uint32_t hlen; /* host length */ uint32_t plen; /* program (name) length */ uint32_t ulen; /* user (name) length */ -}; +} m_msg; #define CLEAR_MSG(m) { (m)->next = NULL; (m)->fields = 0; (m)->flags = 0; \ (m)->msg[0] = '\0'; (m)->host[0] = '\0'; \ @@ -217,9 +217,9 @@ } } -struct m_msg *get_mmsg(void); -void dispose_msgs(struct m_msg *); -int parse_lines(struct m_msg *, char *, size_t, int *); +m_msg *get_mmsg(void); +void dispose_msgs(m_msg *); +int parse_lines(m_msg *, char *, size_t, int *); /* * This structure represents the line rules @@ -228,23 +228,23 @@ * It also keeps last message sent to check for duplicates. */ -struct filed { +typedef struct filed { struct filed *next; /* next in linked list */ time_t time; /* time this filed was last written */ u_short pmask[LOG_NFACILITIES+1]; /* priority mask */ char program[MAX_PROGNAME_SIZE]; /* program name */ /* XXX: this should be some short hash instead */ - struct m_msg prevmsg; /* last message logged */ + m_msg prevmsg; /* last message logged */ int prevcount; /* repetition cnt of prevline */ int repeatcount; /* number of "repeated" msgs */ - struct o_module *omod; /* module details */ -}; + o_module *omod; /* module details */ +} filed; -struct global { +typedef struct m_global { char *prog; /* program name */ char *FileListing; /* File Listing */ FILE *flist_des; /* File Listing descriptor */ -}; +} m_global; void logerror(char *); void logmsg(int, char *, char *, int); @@ -254,21 +254,21 @@ #define MLIB_MAX 10 /* max external libs per module */ -struct omodule { +typedef struct omodule { char *name; - int (*init) (int, char **, struct filed *, struct global*, void **, char **); - int (*write) (struct filed *, struct m_msg *, void *); - int (*flush) (struct filed *, void *); - int (*close) (struct filed *, void *); -}; + int (*init) (int, char **, filed *, m_ global *, void **, char **); + int (*write) (filed *, m_msg *, void *); + int (*flush) (filed *, void *); + int (*close) (filed *, void *); +} omodule; -struct imodule { +typedef struct imodule { char *name; - int (*init) (struct i_module *, char **, int); - int (*read) (struct i_module *, int, struct m_msg *); - int (*close) (struct i_module *); /* close input, optional */ - int (*poll) (struct i_module *); -}; + int (*init) (i_module *, char **, int); + int (*read) (i_module *, int, m_msg *); + int (*close) (i_module *); /* close input, optional */ + int (*poll) (i_module *); +} imodule; #define MAXREPEAT ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1) Index: modules.h =================================================================== RCS file: /cvsroot/msyslog/syslog/src/modules.h,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- modules.h 28 May 2003 18:05:39 -0000 1.55 +++ modules.h 15 Jun 2003 01:14:22 -0000 1.56 @@ -51,19 +51,19 @@ * This structure represents main details for the output modules */ -struct o_module { +typedef struct o_module { struct o_module *next; struct omodule *func; /* where are this puppy's functions? */ void *ctx; /* XXX: remove this */ char *status; -}; +} o_module; /* * This structure represents main details for the input modules */ -struct i_module { +typedef struct i_module { struct i_module *next; struct imodule *func; /* where are this puppy's functions? */ int fd; /* the main file descriptor */ @@ -71,9 +71,9 @@ int blen; int flags; /* internal module flags */ void *ctx; -}; +} i_module; -int watch_fd_input(char, int , struct i_module *); /* add this fd to poll array */ +int watch_fd_input(char, int , i_module *); /* add this fd to poll array */ void unwatch_fd_input(char, int); /* remove this fd from poll arrays */ #endif |
From: <al...@us...> - 2003-06-14 00:20:51
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv19826 Modified Files: Makefile.in Log Message: byebye old peo Index: Makefile.in =================================================================== RCS file: /cvsroot/msyslog/syslog/Makefile.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile.in 22 May 2003 06:57:37 -0000 1.30 +++ Makefile.in 14 Jun 2003 00:20:47 -0000 1.31 @@ -28,8 +28,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SUBDIRS = src/peo src src/man -INSTALL_SUBDIRS = src src/peo src/man +SUBDIRS = src src/man +INSTALL_SUBDIRS = src src/man MSYSLOG_VERSION = @MSYSLOG_VERSION@ RELEASE= msyslog-v${MSYSLOG_VERSION} TARBALL= ${RELEASE}-src.tar.gz |
From: <al...@us...> - 2003-06-13 20:09:08
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv15114 Modified Files: AUTHORS INSTALL QUICK_INSTALL README Log Message: remove peo mentions. while there fix authors a bit Index: AUTHORS =================================================================== RCS file: /cvsroot/msyslog/syslog/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- AUTHORS 4 Apr 2003 21:48:53 -0000 1.6 +++ AUTHORS 13 Jun 2003 20:09:05 -0000 1.7 @@ -10,9 +10,9 @@ The OpenBSD project(www.openbsd.org) project did a security audit and adapted it Alejo Sanchez (al...@co...) developed Modular Syslog for Core-SDI general coding specially autoconf, sql support, dynamic library use. Federico Schwindt (fg...@co...) did configure -Claudio Castiglia (cl...@co...) did makefile work, peo and linux module. +Claudio Castiglia (cl...@co...) did makefile work, linux module. The Core-SDI consulting project did security audit for msyslog 1.0 -Javier Kohen (jk...@co...) did bug fixes +Javier Kohen (jk...@co...) did lots of bug fixes, and oracle module Florin Andrei (fl...@sg...) helped debug and improve the project Fredrick Paul Eisele (ph...@ne...) did more modules and general fixing Index: INSTALL =================================================================== RCS file: /cvsroot/msyslog/syslog/INSTALL,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- INSTALL 24 Sep 2002 20:12:20 -0000 1.19 +++ INSTALL 13 Jun 2003 20:09:05 -0000 1.20 @@ -26,8 +26,8 @@ Most of the documentation and examples are on the manual pages provided. They are meant to be the ultimate reference. See im_bsd.8, im_linux.8 -im_udp.8, om_mysql.8, om_regex.8, peochk.8 im_doors.8, im_streams.8 -im_unix.8, om_peo.8, om_tcp.8, syslog.conf.5, im_file.8, im_tcp.8 +im_udp.8, om_mysql.8, om_regex.8, im_doors.8, im_streams.8 +im_unix.8, om_tcp.8, syslog.conf.5, im_file.8, im_tcp.8 om_classic.8, om_pgsql.8, om_udp.8, and syslogd.8. @@ -122,19 +122,14 @@ 3. MODULE SPECIFIC NOTES =========================== -3.a PEO - - See om_peo(8), peochk(8) and syslog.conf(5) manpages for details and -proper setup instructions. - -3.b MySQL +3.a MySQL If your libmysqlclient library isn't in your linker path, you must add the corresponding directory on the shell variable LD_PATH. See "om_mysql" manpage for details and proper setup instructions. -3.c PostgreSQL +3.b PostgreSQL If your libpq library isn't in your linker path, you must add the corresponding directory on the shell variable LD_PATH. Index: QUICK_INSTALL =================================================================== RCS file: /cvsroot/msyslog/syslog/QUICK_INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- QUICK_INSTALL 17 Apr 2003 18:36:44 -0000 1.2 +++ QUICK_INSTALL 13 Jun 2003 20:09:05 -0000 1.3 @@ -14,8 +14,8 @@ Most of the documentation and examples are on the manual pages provided. They are meant to be the ultimate reference. See im_bsd.8, im_linux.8 -im_udp.8, om_mysql.8, om_regex.8, peochk.8 im_doors.8, im_streams.8 -im_unix.8, om_peo.8, om_tcp.8, syslog.conf.5, im_file.8, im_tcp.8 +im_udp.8, om_mysql.8, om_regex.8, im_doors.8, im_streams.8 +im_unix.8, om_tcp.8, syslog.conf.5, im_file.8, im_tcp.8 om_classic.8, om_pgsql.8, om_udp.8, and syslogd.8. @@ -52,7 +52,6 @@ - read syslog.conf manpage, and understand the '%' usage (it is easy, checkout the examples) - on Solaris, remove all those LOG macros on /etc/syslog.conf. -- see peochk and om_peo manpages' examples for hash protection - checkout all modules you may like withe their manpages. they ALL have examples - om_regex Index: README =================================================================== RCS file: /cvsroot/msyslog/syslog/README,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- README 17 Apr 2003 20:04:15 -0000 1.20 +++ README 13 Jun 2003 20:09:05 -0000 1.21 @@ -6,8 +6,8 @@ Most of the documentation and examples are on the manual pages provided. They are meant to be the ultimate reference. See im_bsd.8, im_linux.8 -im_udp.8, om_mysql.8, om_regex.8, peochk.8 im_doors.8, im_streams.8 -im_unix.8, om_peo.8, om_tcp.8, syslog.conf.5, im_file.8, im_tcp.8 +im_udp.8, om_mysql.8, om_regex.8, im_doors.8, im_streams.8 +im_unix.8, om_tcp.8, syslog.conf.5, im_file.8, im_tcp.8 om_classic.8, om_pgsql.8, om_udp.8, and syslogd.8. @@ -73,7 +73,7 @@ This new approach allows adding new functionality without complicating the code. -Current available output modules are classic, mysql, peo, pgsql, regex and +Current available output modules are classic, mysql, pgsql, regex and tcp. Available input modules are bsd, linux, unix, tcp and udp. Classic Output Module @@ -102,12 +102,6 @@ hour, date or host. If message matches all, the next module in the configuration file is called. If reverse flag is used, pass all but matching messages. See om_regex(8) manpage for more details. - -Peo Output Module ------------------ - -This module does hash protection on logs. See om_peo(8) manpage for more -information on useage. TCP Output Module ----------------- |
From: <al...@us...> - 2003-06-13 20:03:03
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv14182 Modified Files: configure configure.in aclocal.m4 Log Message: check for OpenSSL Index: configure =================================================================== RCS file: /cvsroot/msyslog/syslog/configure,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- configure 13 Jun 2003 19:38:32 -0000 1.101 +++ configure 13 Jun 2003 20:02:58 -0000 1.102 @@ -2953,7 +2953,39 @@ fi -echo "$as_me:2956: checking for dlopen in -ldl" >&5 + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then + found_ssl="yes"; + CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + break; [...1426 lines suppressed...] { (exit 1); exit 1; }; } echo $f;; @@ -5675,7 +5708,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5678: error: cannot find input file: $f" >&5 + { { echo "$as_me:5711: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5792,7 +5825,7 @@ rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:5795: $ac_file is unchanged" >&5 + { echo "$as_me:5828: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ Index: configure.in =================================================================== RCS file: /cvsroot/msyslog/syslog/configure.in,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- configure.in 13 Jun 2003 19:38:35 -0000 1.164 +++ configure.in 13 Jun 2003 20:02:59 -0000 1.165 @@ -40,6 +40,14 @@ AC_HEADER_TIME AC_STRUCT_TM +dnl We require OpenSSL +CHECK_SSL +if test "x$HAVE_SSL" != "xyes" +then + echo "Modular Syslog requires OpenSSL"; + exit 1; +fi + dnl Checks for library functions. AC_CHECK_LIB(dl, dlopen, SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl") AC_CHECK_LIB(socket, connect, SYSLOGD_LIBS="$SYSLOGD_LIBS -lsocket") Index: aclocal.m4 =================================================================== RCS file: /cvsroot/msyslog/syslog/aclocal.m4,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- aclocal.m4 10 Mar 2001 00:26:05 -0000 1.31 +++ aclocal.m4 13 Jun 2003 20:02:59 -0000 1.32 @@ -101,3 +101,33 @@ undefine([AC_CV_NAME])dnl ]) +dnl Available from the GNU Autoconf Macro Archive at: +dnl http://www.gnu.org/software/ac-archive/htmldoc/check_ssl.html +dnl +AC_DEFUN([CHECK_SSL], +[ for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then + found_ssl="yes"; + CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + break; + fi + if test -f "$dir/include/ssl.h"; then + found_ssl="yes"; + CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL"; + CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL"; + break + fi + done + if test x_$found_ssl != x_yes; then + AC_MSG_ERROR(Cannot find ssl libraries) + else + printf "OpenSSL found in $ssldir\n"; + LIBS="$LIBS -lssl -lcrypto"; + LDFLAGS="$LDFLAGS -L$ssldir/lib"; + HAVE_SSL=yes + fi + AC_SUBST(HAVE_SSL) +])dnl + |
From: <al...@us...> - 2003-06-13 19:49:37
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv11922 Modified Files: TODO Log Message: update Index: TODO =================================================================== RCS file: /cvsroot/msyslog/syslog/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- TODO 13 Jun 2003 19:37:41 -0000 1.9 +++ TODO 13 Jun 2003 19:49:30 -0000 1.10 @@ -8,6 +8,8 @@ - fix om_regex - use libevent - use queue.h (modules, im_tcp, etc) +- ssl module (use evp) +- consider changing all to openssl's BIO - allow somehow to set inputs on syslog.conf - new configuration from 2.x - crash when /etc/msyslog.conf is not there? |
From: <al...@us...> - 2003-06-13 19:38:40
|
Update of /cvsroot/msyslog/syslog/src/man In directory sc8-pr-cvs1:/tmp/cvs-serv9711/src/man Modified Files: om_classic.8 om_directory.8 om_mysql.8 om_oracle8i.8 om_pgsql.8 om_refract.8 om_regex.8 om_tcp.8 om_udp.8 syslog.conf.5 syslogd.8 Removed Files: om_peo.8 peochk.8 Log Message: 1- remove old peo 2- ? 3- PROFIT! Index: om_classic.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_classic.8,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- om_classic.8 17 Sep 2002 05:20:27 -0000 1.5 +++ om_classic.8 13 Jun 2003 19:38:35 -0000 1.6 @@ -81,12 +81,10 @@ .Xr syslog 3 , .Xr syslog.conf 5 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh BUGS .Bl -bullet Index: om_directory.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_directory.8,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- om_directory.8 16 Aug 2002 14:35:56 -0000 1.1 +++ om_directory.8 13 Jun 2003 19:38:35 -0000 1.2 @@ -48,12 +48,10 @@ .Xr syslog 3 , .Xr syslog.conf 5 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh BUGS .Bl -bullet Index: om_mysql.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_mysql.8,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- om_mysql.8 28 May 2003 18:03:06 -0000 1.25 +++ om_mysql.8 13 Jun 2003 19:38:35 -0000 1.26 @@ -107,12 +107,10 @@ .Xr syslog 3 , .Xr syslog.conf 5 , .Xr om_classic 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh BUGS .Bl -bullet Index: om_oracle8i.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_oracle8i.8,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- om_oracle8i.8 17 Apr 2003 19:25:45 -0000 1.1 +++ om_oracle8i.8 13 Jun 2003 19:38:35 -0000 1.2 @@ -91,12 +91,10 @@ .Xr syslog 3 , .Xr syslog.conf 5 , .Xr om_classic 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh BUGS .Bl -bullet Index: om_pgsql.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_pgsql.8,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- om_pgsql.8 17 Sep 2002 05:20:27 -0000 1.10 +++ om_pgsql.8 13 Jun 2003 19:38:35 -0000 1.11 @@ -101,11 +101,9 @@ .Xr syslog.conf 5 , .Xr om_classic 8 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh BUGS .Bl -bullet Index: om_refract.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_refract.8,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- om_refract.8 14 Aug 2002 19:45:16 -0000 1.2 +++ om_refract.8 13 Jun 2003 19:38:35 -0000 1.3 @@ -67,9 +67,7 @@ .Xr syslog.conf.5 , .Xr om_classic.8 , .Xr om_mysql.8 , -.Xr om_peo.8 , .Xr om_pgsql.8 , .Xr om_regex.8 , .Xr om_udp.8 , -.Xr peochk.8 , .Xr syslogd.8 Index: om_regex.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_regex.8,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- om_regex.8 17 Sep 2002 05:20:27 -0000 1.14 +++ om_regex.8 13 Jun 2003 19:38:35 -0000 1.15 @@ -67,11 +67,9 @@ .Xr syslog.conf 5 , .Xr om_classic 8 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh BUGS .Bl -bullet Index: om_tcp.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_tcp.8,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- om_tcp.8 17 Sep 2002 05:20:27 -0000 1.9 +++ om_tcp.8 13 Jun 2003 19:38:35 -0000 1.10 @@ -76,9 +76,7 @@ .Xr syslog.conf 5 , .Xr om_classic 8 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 Index: om_udp.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/om_udp.8,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- om_udp.8 17 Sep 2002 05:20:27 -0000 1.5 +++ om_udp.8 13 Jun 2003 19:38:35 -0000 1.6 @@ -73,9 +73,7 @@ .Xr syslog.conf 5 , .Xr om_classic 8 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , -.Xr peochk 8 , .Xr syslogd 8 Index: syslog.conf.5 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/syslog.conf.5,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- syslog.conf.5 17 Sep 2002 05:20:27 -0000 1.16 +++ syslog.conf.5 13 Jun 2003 19:38:35 -0000 1.17 @@ -324,12 +324,10 @@ .Xr syslog 3 , .Xr om_classic 8 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh HISTORY The Index: syslogd.8 =================================================================== RCS file: /cvsroot/msyslog/syslog/src/man/syslogd.8,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- syslogd.8 17 Sep 2002 05:20:27 -0000 1.22 +++ syslogd.8 13 Jun 2003 19:38:35 -0000 1.23 @@ -192,12 +192,10 @@ .Xr im_udp 8 , .Xr om_classic 8 , .Xr om_mysql 8 , -.Xr om_peo 8 , .Xr om_pgsql 8 , .Xr om_regex 8 , .Xr om_tcp 8 , .Xr om_udp 8 , -.Xr peochk 8 , .Xr syslogd 8 .Sh HISTORY Modular --- om_peo.8 DELETED --- --- peochk.8 DELETED --- |
From: <al...@us...> - 2003-06-13 19:38:40
|
Update of /cvsroot/msyslog/syslog/src/modules In directory sc8-pr-cvs1:/tmp/cvs-serv9711/src/modules Removed Files: om_peo.c Log Message: 1- remove old peo 2- ? 3- PROFIT! --- om_peo.c DELETED --- |
Update of /cvsroot/msyslog/syslog/src/peo In directory sc8-pr-cvs1:/tmp/cvs-serv9711/src/peo Removed Files: Makefile.in TODO hash.c hash.h md5.h md5c.c peochk.c rmd160.c rmd160.h sha1.c sha1.h typedefs.h Log Message: 1- remove old peo 2- ? 3- PROFIT! --- Makefile.in DELETED --- --- TODO DELETED --- --- hash.c DELETED --- --- hash.h DELETED --- --- md5.h DELETED --- --- md5c.c DELETED --- --- peochk.c DELETED --- --- rmd160.c DELETED --- --- rmd160.h DELETED --- --- sha1.c DELETED --- --- sha1.h DELETED --- --- typedefs.h DELETED --- |
From: <al...@us...> - 2003-06-13 19:38:39
|
Update of /cvsroot/msyslog/syslog In directory sc8-pr-cvs1:/tmp/cvs-serv9711 Modified Files: configure configure.in Log Message: 1- remove old peo 2- ? 3- PROFIT! Index: configure =================================================================== RCS file: /cvsroot/msyslog/syslog/configure,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- configure 4 Jun 2003 17:19:37 -0000 1.100 +++ configure 13 Jun 2003 19:38:32 -0000 1.101 @@ -704,9 +704,6 @@ --without-pgsql Use pgsql PostgreSQL output module. Activated by default. - --without-peo - Use peo log integrity verification module. Activated by default. - --without-queue Use a directory to queue messages. Activated by default. @@ -910,7 +907,7 @@ fi [...3181 lines suppressed...] { (exit 1); exit 1; }; } echo $f;; @@ -5914,7 +5675,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5917: error: cannot find input file: $f" >&5 + { { echo "$as_me:5678: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -6031,7 +5792,7 @@ rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:6034: $ac_file is unchanged" >&5 + { echo "$as_me:5795: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ Index: configure.in =================================================================== RCS file: /cvsroot/msyslog/syslog/configure.in,v retrieving revision 1.163 retrieving revision 1.164 diff -u -d -r1.163 -r1.164 --- configure.in 4 Jun 2003 17:19:39 -0000 1.163 +++ configure.in 13 Jun 2003 19:38:35 -0000 1.164 @@ -418,19 +418,6 @@ MSRCS="$MSRCS sql_misc.c" fi -AC_ARG_WITH(peo, -[ --without-peo - Use peo log integrity verification module. Activated by default. -],[ - if test $with_peo = "yes" ; then - PEO=yes - else - PEO=no - fi -],[ - PEO=yes -]) - AC_ARG_WITH(queue, [ --without-queue Use a directory to queue messages. Activated by default. @@ -463,27 +450,6 @@ AC_DEFINE(HAVE_REFRACT_OMODULE, 1) ]) -HASH_SRCS=""; -if test $PEO = "yes" ; then - - MSRCS="$MSRCS om_peo.c" - MANPAGES="$MANPAGES om_peo.8 peochk.8" - - HASH_SRCS="../peo/hash.c"; - AC_CHECK_FUNC(MD5Init, AC_DEFINE(HAVE_MD5, 1), - HASH_SRCS="$HASH_SRCS ../peo/md5c.c"; - ) - AC_CHECK_FUNC(SHA1Init, AC_DEFINE(HAVE_SHA1, 1), - HASH_SRCS="$HASH_SRCS ../peo/sha1.c"; - ) - AC_CHECK_FUNC(RMD160Init, AC_DEFINE(HAVE_RMD160, 1), - HASH_SRCS="$HASH_SRCS ../peo/rmd160.c"; - ) - if test -r /dev/srandom ; then - AC_DEFINE(HAVE_SRANDOM, 1) - fi -fi - AC_ARG_WITH(regex, [ --without-regex Use regex pattern matching output module. Activated by default. @@ -554,7 +520,6 @@ AC_OUTPUT([Makefile src/Makefile - src/peo/Makefile src/man/Makefile src/man/BSDmakefile src/man/GNUmakefile |