[netfilter-cvslog] r4507 - in trunk/libnetfilter_log: .
include/libnetfilter_log src
laforge at netfilter.org
laforge at netfilter.org
Fri Nov 11 18:07:38 CET 2005
Author: laforge at netfilter.org
Date: 2005-11-11 18:07:37 +0100 (Fri, 11 Nov 2005)
New Revision: 4507
Added:
trunk/libnetfilter_log/include/libnetfilter_log/linux_nfnetlink_log.h
Modified:
trunk/libnetfilter_log/configure.in
trunk/libnetfilter_log/include/libnetfilter_log/Makefile.am
trunk/libnetfilter_log/include/libnetfilter_log/libnetfilter_log.h
trunk/libnetfilter_log/src/libnetfilter_log.c
Log:
- use local copy of nfnetlink_log.h instead of kernel include file
- bump version number to 0.0.11
Modified: trunk/libnetfilter_log/configure.in
===================================================================
--- trunk/libnetfilter_log/configure.in 2005-11-11 17:06:53 UTC (rev 4506)
+++ trunk/libnetfilter_log/configure.in 2005-11-11 17:07:37 UTC (rev 4507)
@@ -4,7 +4,7 @@
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(libnetfilter_log, 0.0.10)
+AM_INIT_AUTOMAKE(libnetfilter_log, 0.0.11)
AC_PROG_CC
AM_PROG_LIBTOOL
@@ -19,49 +19,8 @@
esac
AC_CHECK_LIB([nfnetlink], [nfnl_listen])
+AC_CHECK_HEADER([libnfnetlink/linux_nfnetlink.h], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([libnfnetlink 0.0.12 or later needed])])
-
-
-dnl--------------------------------
-
-AC_DEFUN([NF_KERNEL_SOURCE],[
-
- if test "$with_kernel" = ""; then
- KERNEL="`uname -r`"
- else
- KERNEL="$with_kernel"
- fi
-
- THIS_PREFIX=""
- for i in "/lib/modules/$KERNEL/build/include" "$KERNEL" "$KERNEL/include" "/usr/src/linux-$KERNEL" "/usr/src/kernel-$KERNEL" "/usr/src/linux-headers-$KERNEL" "/usr/src/kernel-headers-$KERNEL"
- do
- AC_MSG_CHECKING([Looking for kernel source or headers in $i])
- if test -r "$i/linux/config.h"
- then
- THIS_PREFIX="$i"
- AC_MSG_RESULT([found])
- break
- fi
- AC_MSG_RESULT([ ])
- done
- if test -r "$THIS_PREFIX/linux/config.h" ; then
- AC_SUBST(KERNELDIR,[$THIS_PREFIX])
- AC_MSG_RESULT([found])
- else
- AC_MSG_ERROR([not found $THIS_PREFIX])
- fi
-
- # somehow add this as an include path
-])
-
-AC_ARG_WITH(kernel,
- AC_HELP_STRING([--with-kernel=DIR],
- [ Show location of kernel source. Default is to use uname -r and look in /lib/modules/KERNEL/build/include. ]),
- NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE())
-
-dnl--------------------------------
-
-
dnl Output the makefile
AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile)
Modified: trunk/libnetfilter_log/include/libnetfilter_log/Makefile.am
===================================================================
--- trunk/libnetfilter_log/include/libnetfilter_log/Makefile.am 2005-11-11 17:06:53 UTC (rev 4506)
+++ trunk/libnetfilter_log/include/libnetfilter_log/Makefile.am 2005-11-11 17:07:37 UTC (rev 4507)
@@ -1,3 +1,3 @@
-pkginclude_HEADERS = libnetfilter_log.h libipulog.h
+pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
Modified: trunk/libnetfilter_log/include/libnetfilter_log/libnetfilter_log.h
===================================================================
--- trunk/libnetfilter_log/include/libnetfilter_log/libnetfilter_log.h 2005-11-11 17:06:53 UTC (rev 4506)
+++ trunk/libnetfilter_log/include/libnetfilter_log/libnetfilter_log.h 2005-11-11 17:07:37 UTC (rev 4507)
@@ -9,8 +9,7 @@
#ifndef __LIBNETFILTER_LOG_H
#define __LIBNETFILTER_LOG_H
-#include <libnfnetlink/libnfnetlink.h>
-#include <linux/netfilter/nfnetlink_log.h>
+#include <libnetfilter_log/linux_nfnetlink_log.h>
struct nflog_handle;
struct nflog_g_handle;
Added: trunk/libnetfilter_log/include/libnetfilter_log/linux_nfnetlink_log.h
===================================================================
--- trunk/libnetfilter_log/include/libnetfilter_log/linux_nfnetlink_log.h 2005-11-11 17:06:53 UTC (rev 4506)
+++ trunk/libnetfilter_log/include/libnetfilter_log/linux_nfnetlink_log.h 2005-11-11 17:07:37 UTC (rev 4507)
@@ -0,0 +1,92 @@
+#ifndef _NFNETLINK_LOG_H
+#define _NFNETLINK_LOG_H
+
+/* This file describes the netlink messages (i.e. 'protocol packets'),
+ * and not any kind of function definitions. It is shared between kernel and
+ * userspace. Don't put kernel specific stuff in here */
+
+#include <linux/types.h>
+#include <libnfnetlink/linux_nfnetlink.h>
+
+#ifndef aligned_u64
+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#endif
+
+enum nfulnl_msg_types {
+ NFULNL_MSG_PACKET, /* packet from kernel to userspace */
+ NFULNL_MSG_CONFIG, /* connect to a particular queue */
+
+ NFULNL_MSG_MAX
+};
+
+struct nfulnl_msg_packet_hdr {
+ u_int16_t hw_protocol; /* hw protocol (network order) */
+ u_int8_t hook; /* netfilter hook */
+ u_int8_t _pad;
+} __attribute__ ((packed));
+
+struct nfulnl_msg_packet_hw {
+ u_int16_t hw_addrlen;
+ u_int16_t _pad;
+ u_int8_t hw_addr[8];
+} __attribute__ ((packed));
+
+struct nfulnl_msg_packet_timestamp {
+ aligned_u64 sec;
+ aligned_u64 usec;
+} __attribute__ ((packed));
+
+#define NFULNL_PREFIXLEN 30 /* just like old log target */
+
+enum nfulnl_attr_type {
+ NFULA_UNSPEC,
+ NFULA_PACKET_HDR,
+ NFULA_MARK, /* u_int32_t nfmark */
+ NFULA_TIMESTAMP, /* nfulnl_msg_packet_timestamp */
+ NFULA_IFINDEX_INDEV, /* u_int32_t ifindex */
+ NFULA_IFINDEX_OUTDEV, /* u_int32_t ifindex */
+ NFULA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */
+ NFULA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */
+ NFULA_HWADDR, /* nfulnl_msg_packet_hw */
+ NFULA_PAYLOAD, /* opaque data payload */
+ NFULA_PREFIX, /* string prefix */
+ NFULA_UID, /* user id of socket */
+
+ __NFULA_MAX
+};
+#define NFULA_MAX (__NFULA_MAX - 1)
+
+enum nfulnl_msg_config_cmds {
+ NFULNL_CFG_CMD_NONE,
+ NFULNL_CFG_CMD_BIND,
+ NFULNL_CFG_CMD_UNBIND,
+ NFULNL_CFG_CMD_PF_BIND,
+ NFULNL_CFG_CMD_PF_UNBIND,
+};
+
+struct nfulnl_msg_config_cmd {
+ u_int8_t command; /* nfulnl_msg_config_cmds */
+} __attribute__ ((packed));
+
+struct nfulnl_msg_config_mode {
+ u_int32_t copy_range;
+ u_int8_t copy_mode;
+ u_int8_t _pad;
+} __attribute__ ((packed));
+
+enum nfulnl_attr_config {
+ NFULA_CFG_UNSPEC,
+ NFULA_CFG_CMD, /* nfulnl_msg_config_cmd */
+ NFULA_CFG_MODE, /* nfulnl_msg_config_mode */
+ NFULA_CFG_NLBUFSIZ, /* u_int32_t buffer size */
+ NFULA_CFG_TIMEOUT, /* u_int32_t in 1/100 s */
+ NFULA_CFG_QTHRESH, /* u_int32_t */
+ __NFULA_CFG_MAX
+};
+#define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
+
+#define NFULNL_COPY_NONE 0x00
+#define NFULNL_COPY_META 0x01
+#define NFULNL_COPY_PACKET 0x02
+
+#endif /* _NFNETLINK_LOG_H */
Modified: trunk/libnetfilter_log/src/libnetfilter_log.c
===================================================================
--- trunk/libnetfilter_log/src/libnetfilter_log.c 2005-11-11 17:06:53 UTC (rev 4506)
+++ trunk/libnetfilter_log/src/libnetfilter_log.c 2005-11-11 17:07:37 UTC (rev 4507)
@@ -25,6 +25,9 @@
#include <errno.h>
#include <netinet/in.h>
#include <sys/socket.h>
+
+#include <libnetfilter_log/linux_nfnetlink_log.h>
+
#include <libnfnetlink/libnfnetlink.h>
#include <libnetfilter_log/libnetfilter_log.h>
More information about the netfilter-cvslog
mailing list