diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | include/ulogd/Makefile.am | 2 | ||||
| -rw-r--r-- | include/ulogd/printpkt.h | 10 | ||||
| -rw-r--r-- | output/Makefile.am | 4 | ||||
| -rw-r--r-- | output/ulogd_output_LOGEMU.c | 2 | ||||
| -rw-r--r-- | output/ulogd_output_SYSLOG.c | 3 | ||||
| -rw-r--r-- | util/printpkt.c | 4 | ||||
| -rw-r--r-- | util/printpkt.h | 7 |
9 files changed, 20 insertions, 16 deletions
diff --git a/configure.in b/configure.in index 228dead..3ce5913 100644 --- a/configure.in +++ b/configure.in @@ -67,4 +67,4 @@ AC_OUTPUT(doc/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) + src/Makefile Makefile Rules.make ulogd.conf) diff --git a/debian/control b/debian/control index 8b832cc..0118862 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ulogd Section: net Priority: optional Maintainer: Harald Welte <laforge@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 diff --git a/include/ulogd/Makefile.am b/include/ulogd/Makefile.am index 5201d15..0933390 100644 --- a/include/ulogd/Makefile.am +++ b/include/ulogd/Makefile.am @@ -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 diff --git a/include/ulogd/printpkt.h b/include/ulogd/printpkt.h new file mode 100644 index 0000000..90ff134 --- /dev/null +++ b/include/ulogd/printpkt.h @@ -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 diff --git a/output/Makefile.am b/output/Makefile.am index 9a966d2..88e353e 100644 --- a/output/Makefile.am +++ b/output/Makefile.am @@ -6,10 +6,10 @@ SUBDIRS= pcap mysql pgsql sqlite3 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 diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c index 4be4807..f18da61 100644 --- a/output/ulogd_output_LOGEMU.c +++ b/output/ulogd_output_LOGEMU.c @@ -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" diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c index 70230f0..3d08f74 100644 --- a/output/ulogd_output_SYSLOG.c +++ b/output/ulogd_output_SYSLOG.c @@ -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" diff --git a/util/printpkt.c b/util/printpkt.c index 2a32b5c..ecd810f 100644 --- a/util/printpkt.c +++ b/util/printpkt.c @@ -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", }, diff --git a/util/printpkt.h b/util/printpkt.h deleted file mode 100644 index ce42de4..0000000 --- a/util/printpkt.h +++ /dev/null @@ -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 |