summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/Makefile.am2
-rw-r--r--include/libnetfilter_log/Makefile.am3
-rw-r--r--include/libnetfilter_log/libipulog.h (renamed from include/libnfnetlink_log/libipulog.h)0
-rw-r--r--include/libnetfilter_log/libnfnetlink_log.h (renamed from include/libnfnetlink_log/libnfnetlink_log.h)8
-rw-r--r--include/libnfnetlink_log/Makefile.am3
-rw-r--r--src/Makefile.am10
-rw-r--r--src/libipulog_compat.c4
-rw-r--r--src/libnetfilter_log.c (renamed from src/libnfnetlink_log.c)2
-rw-r--r--utils/Makefile.am7
-rw-r--r--utils/nfulnl_test.c2
-rw-r--r--utils/ulog_test.c2
11 files changed, 20 insertions, 23 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index f454d1d..5077115 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = libnfnetlink_log
+SUBDIRS = libnetfilter_log
diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am
new file mode 100644
index 0000000..c182ac7
--- /dev/null
+++ b/include/libnetfilter_log/Makefile.am
@@ -0,0 +1,3 @@
+
+pkginclude_HEADERS = libnetfilter_log.h libipulog.h
+
diff --git a/include/libnfnetlink_log/libipulog.h b/include/libnetfilter_log/libipulog.h
index 0278862..0278862 100644
--- a/include/libnfnetlink_log/libipulog.h
+++ b/include/libnetfilter_log/libipulog.h
diff --git a/include/libnfnetlink_log/libnfnetlink_log.h b/include/libnetfilter_log/libnfnetlink_log.h
index 707bba8..ff546d1 100644
--- a/include/libnfnetlink_log/libnfnetlink_log.h
+++ b/include/libnetfilter_log/libnfnetlink_log.h
@@ -1,4 +1,4 @@
-/* libnfnetlink_log.h: Header file for the Netfilter Userspace Log library.
+/* libnetfilter_log.h: Header file for the Netfilter Userspace Log library.
*
* (C) 2005 by Harald Welte <laforge@gnumonks.org>
*
@@ -6,8 +6,8 @@
* of the GNU General Public License, incorporated herein by reference.
*/
-#ifndef __LIBNFNETLINK_LOG_H
-#define __LIBNFNETLINK_LOG_H
+#ifndef __LIBNETFILTER_LOG_H
+#define __LIBNETFILTER_LOG_H
#include <libnfnetlink/libnfnetlink.h>
#include <linux/netfilter/nfnetlink_log.h>
@@ -44,4 +44,4 @@ extern int nfulnl_callback_register(struct nfulnl_g_handle *gh,
nfulnl_callback *cb, void *data);
extern int nfulnl_handle_packet(struct nfulnl_handle *h, char *buf, int len);
-#endif /* __LIBNFNETLINK_LOG_H */
+#endif /* __LIBNETFILTER_LOG_H */
diff --git a/include/libnfnetlink_log/Makefile.am b/include/libnfnetlink_log/Makefile.am
deleted file mode 100644
index ea4bfc0..0000000
--- a/include/libnfnetlink_log/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pkginclude_HEADERS = libnfnetlink_log.h libipulog.h
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 9593d92..0163ef5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
AM_CFLAGS=-fPIC -Wall
LIBS=
-lib_LTLIBRARIES = libnfnetlink_log.la libnfnetlink_log_libipulog.la
+lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
-libnfnetlink_log_la_LDFLAGS = -Wc,-nostartfiles
-libnfnetlink_log_la_SOURCES = libnfnetlink_log.c
+libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles
+libnetfilter_log_la_SOURCES = libnetfilter_log.c
-libnfnetlink_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles
-libnfnetlink_log_libipulog_la_SOURCES = libipulog_compat.c
+libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles
+libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
diff --git a/src/libipulog_compat.c b/src/libipulog_compat.c
index a0675ec..ca535fc 100644
--- a/src/libipulog_compat.c
+++ b/src/libipulog_compat.c
@@ -6,8 +6,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <libnfnetlink/libnfnetlink.h>
-#include <libnfnetlink_log/libnfnetlink_log.h>
-#include <libnfnetlink_log/libipulog.h>
+#include <libnetfilter_log/libnetfilter_log.h>
+#include <libnetfilter_log/libipulog.h>
/* private */
#define PAYLOAD_SIZE 0xffff
diff --git a/src/libnfnetlink_log.c b/src/libnetfilter_log.c
index ee27156..8dc5598 100644
--- a/src/libnfnetlink_log.c
+++ b/src/libnetfilter_log.c
@@ -26,7 +26,7 @@
#include <netinet/in.h>
#include <sys/socket.h>
#include <libnfnetlink/libnfnetlink.h>
-#include <libnfnetlink_log/libnfnetlink_log.h>
+#include <libnetfilter_log/libnetfilter_log.h>
struct nfulnl_handle
{
diff --git a/utils/Makefile.am b/utils/Makefile.am
index a2c2f2e..f8e59ae 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -3,13 +3,10 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR}
bin_PROGRAMS = nfulnl_test ulog_test
nfulnl_test_SOURCES = nfulnl_test.c
-nfulnl_test_LDADD = ../src/libnfnetlink_log.la
+nfulnl_test_LDADD = ../src/libnetfilter_log.la
nfulnl_test_LDFLAGS = -dynamic
-#nfulnl_test_LDFLAGS = $(all_libraries) -lnfnetlink_log
ulog_test_SOURCES = ulog_test.c
-ulog_test_LDADD = ../src/libnfnetlink_log_libipulog.la ../src/libnfnetlink_log.la
+ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la
ulog_test_LDFLAGS = -dynamic
-#ulog_test_LDFLAGS = $(all_libraries) -lnfnetlink_log_libipulog -lnfnetlink_log
-
diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c
index a6d648e..d0d4414 100644
--- a/utils/nfulnl_test.c
+++ b/utils/nfulnl_test.c
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <netinet/in.h>
-#include <libnfnetlink_log/libnfnetlink_log.h>
+#include <libnetfilter_log/libnetfilter_log.h>
static int print_pkt(struct nfattr *tb[])
{
diff --git a/utils/ulog_test.c b/utils/ulog_test.c
index f8515d3..142846b 100644
--- a/utils/ulog_test.c
+++ b/utils/ulog_test.c
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <libnfnetlink_log/libipulog.h>
+#include <libnetfilter_log/libipulog.h>
#define MYBUFSIZ 2048