print version number after startup

diff --git a/TODO b/TODO
index c11e2cb6606091a8241af3fee45f174e23977e08..c6f5e1fb959bacf46b463880ef4847a91f1dbd92 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,14 +7,14 @@ X handle multi-part nlmsgs
 kernel:
 X queue the logging in the kernel and send multiple packets in one 
   multipart nlmsg
-- add timer to flush queue in user-defineable time intervals
+X add timer to flush queue in user-defineable time intervals
 - IPv6 ULOG target
 
 ulogd:
 X MYSQL output plugin
 X syslog compatibility output plugin
 - autoconf-detection of ipt_ULOG.h
-- _fini() support for plugin destructors (needed for clean shutdown and 
+X _fini() support for plugin destructors (needed for clean shutdown and 
   SIGHUP configfile reload
 X commandline option for "to fork or not to fork"
 X various command line options (we don't even have --version)

diff --git a/libipulog/include/libipulog/libipulog.h b/libipulog/include/libipulog/libipulog.h
index 78f4220997efccbbd2371299449808e521bfe28b..8a023c13e82df3b01411bf726c68b3dddbe7dd1c 100644 (file)
--- a/libipulog/include/libipulog/libipulog.h
+++ b/libipulog/include/libipulog/libipulog.h
@@ -1,7 +1,7 @@
 #ifndef _LIBIPULOG_H
 #define _LIBIPULOG_H
 
-/* $Id: libipulog.h,v 1.4 2001/07/03 14:45:16 laforge Exp $ */
+/* $Id: libipulog.h,v 1.5 2002/07/30 07:04:12 laforge Exp $ */
 
 #include <errno.h>
 #include <unistd.h>
@@ -20,7 +20,7 @@
 #endif
 
 struct ipulog_handle;
-static int ipulog_errno;
+extern int ipulog_errno;
 
 u_int32_t ipulog_group2gmask(u_int32_t group);
 

diff --git a/ulogd.c b/ulogd.c
index e2564bf0f70d5a0f8c1d0356163142e572f7af06..9e399eef99ec6f0aa8a1680af3cec71f942ce3bc 100644 (file)
--- a/ulogd.c
+++ b/ulogd.c
@@ -1,6 +1,6 @@
-/* ulogd, Version $Revision: 1.26 $
+/* ulogd, Version $Revision: 1.27 $
  *
- * $Id: ulogd.c,v 1.26 2002/07/30 07:04:12 laforge Exp $
+ * $Id: ulogd.c,v 1.27 2002/07/30 07:15:54 laforge Exp $
  *
  * userspace logging daemon for the netfilter ULOG target
  * of the linux 2.4 netfilter subsystem.
@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: ulogd.c,v 1.26 2002/07/30 07:04:12 laforge Exp $
+ * $Id: ulogd.c,v 1.27 2002/07/30 07:15:54 laforge Exp $
  *
  * Modifications:
  *     14 Jun 2001 Martin Josefsson <gandalf@wlug.westbo.se>
@@ -259,7 +259,7 @@ ulog_iret_t *keyh_getres(unsigned int id)
 
 /***********************************************************************
  * INTERPRETER MANAGEMENT 
- ***********************************************************************
+ ***********************************************************************/
 
 /* try to lookup a registered interpreter for a given name */
 static ulog_interpreter_t *find_interpreter(const char *name)
@@ -464,6 +464,7 @@ static int logfile_open(const char *name)
                        exit(2);
                }
        }
+       ulogd_log(ULOGD_INFO, "ulogd Version %s starting\n", ULOGD_VERSION);
        return 0;
 }
 
@@ -669,7 +670,8 @@ int main(int argc, char* argv[])
 
        /* endless loop receiving packets and handling them over to
         * handle_packet */
-       while (len = ipulog_read(libulog_h, libulog_buf, MYBUFSIZ, 1)) {
+       while (len = ipulog_read(libulog_h, libulog_buf, 
+                                bufsiz_ce.u.value, 1)) {
 
                if (len <= 0) {
                        /* this is not supposed to happen */