[netfilter-cvslog] r6386 - in branches/ulog/ulogd2: . debian
include/ulogd output util
laforge at netfilter.org
laforge at netfilter.org
Mon Jan 9 00:37:53 CET 2006
Author: laforge at netfilter.org
Date: 2006-01-09 00:37:51 +0100 (Mon, 09 Jan 2006)
New Revision: 6386
Added:
branches/ulog/ulogd2/include/ulogd/printpkt.h
Removed:
branches/ulog/ulogd2/util/printpkt.h
Modified:
branches/ulog/ulogd2/configure.in
branches/ulog/ulogd2/debian/control
branches/ulog/ulogd2/include/ulogd/Makefile.am
branches/ulog/ulogd2/output/Makefile.am
branches/ulog/ulogd2/output/ulogd_output_LOGEMU.c
branches/ulog/ulogd2/output/ulogd_output_SYSLOG.c
branches/ulog/ulogd2/util/printpkt.c
Log:
clean up printpkt situation (now we no longer include .c files)
Modified: branches/ulog/ulogd2/configure.in
===================================================================
--- branches/ulog/ulogd2/configure.in 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/configure.in 2006-01-08 23:37:51 UTC (rev 6386)
@@ -67,4 +67,4 @@
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)
+ src/Makefile Makefile Rules.make ulogd.conf)
Modified: branches/ulog/ulogd2/debian/control
===================================================================
--- branches/ulog/ulogd2/debian/control 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/debian/control 2006-01-08 23:37:51 UTC (rev 6386)
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Harald Welte <laforge at netfilter.org>
-Build-Depends: cdbs (>= 0.4), debhelper (>= 4.2), gcc (>= 3.4), libnfnetlink-dev (>= 0.0.13), libnetfilter-conntrack-dev (>= 0.0.28), libnetfilter-log-dev (>= 0.0.12)
+Build-Depends: cdbs (>= 0.4), debhelper (>= 4.2), gcc (>= 3.4), libnfnetlink-dev (>= 0.0.13), libnetfilter-conntrack-dev (>= 0.0.28), libnetfilter-log-dev (>= 0.0.12), libmysqlclient-dev, libpq-dev, libpcap-dev, libsqlite-dev
Standards-Version: 3.6.2
Package: ulogd
Modified: branches/ulog/ulogd2/include/ulogd/Makefile.am
===================================================================
--- branches/ulog/ulogd2/include/ulogd/Makefile.am 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/include/ulogd/Makefile.am 2006-01-08 23:37:51 UTC (rev 6386)
@@ -1,2 +1,2 @@
-noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h
+noinst_HEADERS = conffile.h db.h ipfix_protocol.h linuxlist.h ulogd.h printpkt.h
Copied: branches/ulog/ulogd2/include/ulogd/printpkt.h (from rev 6328, branches/ulog/ulogd2/util/printpkt.h)
===================================================================
--- branches/ulog/ulogd2/util/printpkt.h 2005-12-15 17:32:30 UTC (rev 6328)
+++ branches/ulog/ulogd2/include/ulogd/printpkt.h 2006-01-08 23:37:51 UTC (rev 6386)
@@ -0,0 +1,10 @@
+#ifndef _PRINTPKT_H
+#define _PRINTPKT_H
+
+#define INTR_IDS 35
+extern struct ulogd_key printpkt_keys[INTR_IDS];
+
+int printpkt_print(struct ulogd_key *res, char *buf, int prefix);
+int printpkt_init(void);
+
+#endif
Modified: branches/ulog/ulogd2/output/Makefile.am
===================================================================
--- branches/ulog/ulogd2/output/Makefile.am 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/output/Makefile.am 2006-01-08 23:37:51 UTC (rev 6386)
@@ -6,10 +6,10 @@
pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \
ulogd_output_OPRINT.la ulogd_output_IPFIX.la
-ulogd_output_LOGEMU_la_SOURCES = ulogd_output_LOGEMU.c
+ulogd_output_LOGEMU_la_SOURCES = ulogd_output_LOGEMU.c ../util/printpkt.c
ulogd_output_LOGEMU_la_LDFLAGS = -module
-ulogd_output_SYSLOG_la_SOURCES = ulogd_output_SYSLOG.c
+ulogd_output_SYSLOG_la_SOURCES = ulogd_output_SYSLOG.c ../util/printpkt.c
ulogd_output_SYSLOG_la_LDFLAGS = -module
ulogd_output_OPRINT_la_SOURCES = ulogd_output_OPRINT.c
Modified: branches/ulog/ulogd2/output/ulogd_output_LOGEMU.c
===================================================================
--- branches/ulog/ulogd2/output/ulogd_output_LOGEMU.c 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/output/ulogd_output_LOGEMU.c 2006-01-08 23:37:51 UTC (rev 6386)
@@ -31,7 +31,7 @@
#include <errno.h>
#include <ulogd/ulogd.h>
#include <ulogd/conffile.h>
-#include "../util/printpkt.c"
+#include <ulogd/printpkt.h>
#ifndef ULOGD_LOGEMU_DEFAULT
#define ULOGD_LOGEMU_DEFAULT "/var/log/ulogd.syslogemu"
Modified: branches/ulog/ulogd2/output/ulogd_output_SYSLOG.c
===================================================================
--- branches/ulog/ulogd2/output/ulogd_output_SYSLOG.c 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/output/ulogd_output_SYSLOG.c 2006-01-08 23:37:51 UTC (rev 6386)
@@ -28,9 +28,10 @@
#include <unistd.h>
#include <string.h>
#include <syslog.h>
+#include <errno.h>
#include <ulogd/ulogd.h>
#include <ulogd/conffile.h>
-#include "../util/printpkt.c"
+#include <ulogd/printpkt.h>
#ifndef SYSLOG_FACILITY_DEFAULT
#define SYSLOG_FACILITY_DEFAULT "LOG_KERN"
Modified: branches/ulog/ulogd2/util/printpkt.c
===================================================================
--- branches/ulog/ulogd2/util/printpkt.c 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/util/printpkt.c 2006-01-08 23:37:51 UTC (rev 6386)
@@ -35,6 +35,7 @@
#include <netinet/ip_icmp.h>
#include <ulogd/ulogd.h>
#include <ulogd/conffile.h>
+#include <ulogd/printpkt.h>
#ifndef HOST_NAME_MAX
#warning this libc does not define HOST_NAME_MAX
@@ -49,8 +50,7 @@
static char hostname[HOST_NAME_MAX+1];
-#define INTR_IDS 35
-static struct ulogd_key printpkt_keys[INTR_IDS] = {
+struct ulogd_key printpkt_keys[INTR_IDS] = {
{ .name = "oob.time.sec", },
{ .name = "oob.prefix", },
{ .name = "oob.in", },
Deleted: branches/ulog/ulogd2/util/printpkt.h
===================================================================
--- branches/ulog/ulogd2/util/printpkt.h 2006-01-08 23:37:32 UTC (rev 6385)
+++ branches/ulog/ulogd2/util/printpkt.h 2006-01-08 23:37:51 UTC (rev 6386)
@@ -1,7 +0,0 @@
-#ifndef _PRINTPKT_H
-#define _PRINTPKT_H
-
-int printpkt_print(ulog_iret_t *res, char *buf, int prefix);
-int printpkt_init(void);
-
-#endif
More information about the netfilter-cvslog
mailing list