[netfilter-cvslog] r6382 - in branches/ulog/ulogd2: . include include/libipulog include/ulogd libipulog

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-01-08 23:55:39 +0100 (Sun, 08 Jan 2006)
New Revision: 6382

Added:
   branches/ulog/ulogd2/include/Makefile.am
   branches/ulog/ulogd2/include/libipulog/
   branches/ulog/ulogd2/include/libipulog/libipulog.h
   branches/ulog/ulogd2/include/ulogd/Makefile.am
Removed:
   branches/ulog/ulogd2/libipulog/libipulog.h
Modified:
   branches/ulog/ulogd2/Makefile.am
   branches/ulog/ulogd2/configure.in
   branches/ulog/ulogd2/libipulog/libipulog.c
Log:
further 'make dist' fixes


Modified: branches/ulog/ulogd2/Makefile.am
===================================================================
--- branches/ulog/ulogd2/Makefile.am	2006-01-08 22:38:37 UTC (rev 6381)
+++ branches/ulog/ulogd2/Makefile.am	2006-01-08 22:55:39 UTC (rev 6382)
@@ -6,8 +6,7 @@
 EXTRA_DIST = $(man_MANS)
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = doc libipulog src input filter output
-DIST_SUBDIRS = doc src input filter output
+SUBDIRS = include doc libipulog src input filter output
 
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)

Modified: branches/ulog/ulogd2/configure.in
===================================================================
--- branches/ulog/ulogd2/configure.in	2006-01-08 22:38:37 UTC (rev 6381)
+++ branches/ulog/ulogd2/configure.in	2006-01-08 22:55:39 UTC (rev 6382)
@@ -61,4 +61,10 @@
 dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x)
 dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
 
-AC_OUTPUT(doc/Makefile libipulog/Makefile input/Makefile input/packet/Makefile input/flow/Makefile filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile src/Makefile Makefile Rules.make)
+AC_OUTPUT(doc/Makefile \
+	  include/Makefile include/ulogd/Makefile \
+	  libipulog/Makefile \
+	  input/Makefile input/packet/Makefile input/flow/Makefile \
+	  filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
+	  output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \
+	  src/Makefile Makefile Rules.make)

Added: branches/ulog/ulogd2/include/Makefile.am
===================================================================
--- branches/ulog/ulogd2/include/Makefile.am	2006-01-08 22:38:37 UTC (rev 6381)
+++ branches/ulog/ulogd2/include/Makefile.am	2006-01-08 22:55:39 UTC (rev 6382)
@@ -0,0 +1 @@
+SUBDIRS = ulogd libipulog

Copied: branches/ulog/ulogd2/include/libipulog/libipulog.h (from rev 6328, branches/ulog/ulogd2/libipulog/libipulog.h)

Added: branches/ulog/ulogd2/include/ulogd/Makefile.am
===================================================================
--- branches/ulog/ulogd2/include/ulogd/Makefile.am	2006-01-08 22:38:37 UTC (rev 6381)
+++ branches/ulog/ulogd2/include/ulogd/Makefile.am	2006-01-08 22:55:39 UTC (rev 6382)
@@ -0,0 +1,2 @@
+
+noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h select.h ulogd.h

Modified: branches/ulog/ulogd2/libipulog/libipulog.c
===================================================================
--- branches/ulog/ulogd2/libipulog/libipulog.c	2006-01-08 22:38:37 UTC (rev 6381)
+++ branches/ulog/ulogd2/libipulog/libipulog.c	2006-01-08 22:55:39 UTC (rev 6382)
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <net/if.h>
-#include "libipulog.h"
+#include <libipulog/libipulog.h>
 
 struct ipulog_handle
 {

Deleted: branches/ulog/ulogd2/libipulog/libipulog.h
===================================================================
--- branches/ulog/ulogd2/libipulog/libipulog.h	2006-01-08 22:38:37 UTC (rev 6381)
+++ branches/ulog/ulogd2/libipulog/libipulog.h	2006-01-08 22:55:39 UTC (rev 6382)
@@ -1,60 +0,0 @@
-#ifndef _LIBIPULOG_H
-#define _LIBIPULOG_H
-
-/* $Id$ */
-
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <asm/types.h>
-#include <linux/netlink.h>
-#include <net/if.h>
-#include <linux/netfilter_ipv4/ipt_ULOG.h>
-
-/* FIXME: glibc sucks */
-#ifndef MSG_TRUNC 
-#define MSG_TRUNC	0x20
-#endif
-
-struct ipulog_handle;
-extern int ipulog_errno;
-
-u_int32_t ipulog_group2gmask(u_int32_t group);
-
-struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem);
-
-void ipulog_destroy_handle(struct ipulog_handle *h);
-
-ssize_t ipulog_read(struct ipulog_handle *h,
-		    unsigned char *buf, size_t len, int timeout);
-
-ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h,
-				     const unsigned char *buf,
-				     size_t len);
-
-char *ipulog_strerror(int errcode);
-
-int ipulog_get_fd(struct ipulog_handle *h);
-
-void ipulog_perror(const char *s);
-
-enum 
-{
-	IPULOG_ERR_NONE = 0,
-	IPULOG_ERR_IMPL,
-	IPULOG_ERR_HANDLE,
-	IPULOG_ERR_SOCKET,
-	IPULOG_ERR_BIND,
-	IPULOG_ERR_RECVBUF,
-	IPULOG_ERR_RECV,
-	IPULOG_ERR_NLEOF,
-	IPULOG_ERR_TRUNC,
-	IPULOG_ERR_INVGR,
-	IPULOG_ERR_INVNL,
-};
-#define IPULOG_MAXERR IPULOG_ERR_INVNL
-
-#endif /* _LIBULOG_H */