From ad6426bc6da725dc3a1059a96787300e3fd69c61 Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Sat, 30 Jul 2005 20:46:43 +0000 Subject: new directory structure, make sure include files are installed properly --- include/Makefile.am | 2 +- include/libipulog/libipulog.h | 69 ----------------------------- include/libnfnetlink_log/Makefile.am | 3 ++ include/libnfnetlink_log/libipulog.h | 69 +++++++++++++++++++++++++++++ include/libnfnetlink_log/libnfnetlink_log.h | 2 +- 5 files changed, 74 insertions(+), 71 deletions(-) delete mode 100644 include/libipulog/libipulog.h create mode 100644 include/libnfnetlink_log/Makefile.am create mode 100644 include/libnfnetlink_log/libipulog.h (limited to 'include') diff --git a/include/Makefile.am b/include/Makefile.am index 65b41c8..f454d1d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ -include_HEADERS = libnfnetlink_log/libnfnetlink_log.h libipulog/libipulog.h +SUBDIRS = libnfnetlink_log diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h deleted file mode 100644 index 0278862..0000000 --- a/include/libipulog/libipulog.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef _LIBIPULOG_H -#define _LIBIPULOG_H - -#include -#include -#include - -/* FIXME: glibc sucks */ -#ifndef MSG_TRUNC -#define MSG_TRUNC 0x20 -#endif - -#define ULOG_MAC_LEN 80 -#define ULOG_PREFIX_LEN 32 -#define ULOG_IFNAMSIZ 16 - -/* Format of the ULOG packets passed through netlink */ -typedef struct ulog_packet_msg { - unsigned long mark; - long timestamp_sec; - long timestamp_usec; - unsigned int hook; - char indev_name[ULOG_IFNAMSIZ]; - char outdev_name[ULOG_IFNAMSIZ]; - size_t data_len; - char prefix[ULOG_PREFIX_LEN]; - unsigned char mac_len; - unsigned char mac[ULOG_MAC_LEN]; - unsigned char payload[0]; -} ulog_packet_msg_t; - -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); - -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 /* _LIBIPULOG_H */ diff --git a/include/libnfnetlink_log/Makefile.am b/include/libnfnetlink_log/Makefile.am new file mode 100644 index 0000000..ea4bfc0 --- /dev/null +++ b/include/libnfnetlink_log/Makefile.am @@ -0,0 +1,3 @@ + +pkginclude_HEADERS = libnfnetlink_log.h libipulog.h + diff --git a/include/libnfnetlink_log/libipulog.h b/include/libnfnetlink_log/libipulog.h new file mode 100644 index 0000000..0278862 --- /dev/null +++ b/include/libnfnetlink_log/libipulog.h @@ -0,0 +1,69 @@ +#ifndef _LIBIPULOG_H +#define _LIBIPULOG_H + +#include +#include +#include + +/* FIXME: glibc sucks */ +#ifndef MSG_TRUNC +#define MSG_TRUNC 0x20 +#endif + +#define ULOG_MAC_LEN 80 +#define ULOG_PREFIX_LEN 32 +#define ULOG_IFNAMSIZ 16 + +/* Format of the ULOG packets passed through netlink */ +typedef struct ulog_packet_msg { + unsigned long mark; + long timestamp_sec; + long timestamp_usec; + unsigned int hook; + char indev_name[ULOG_IFNAMSIZ]; + char outdev_name[ULOG_IFNAMSIZ]; + size_t data_len; + char prefix[ULOG_PREFIX_LEN]; + unsigned char mac_len; + unsigned char mac[ULOG_MAC_LEN]; + unsigned char payload[0]; +} ulog_packet_msg_t; + +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); + +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 /* _LIBIPULOG_H */ diff --git a/include/libnfnetlink_log/libnfnetlink_log.h b/include/libnfnetlink_log/libnfnetlink_log.h index d020d3b..10345fd 100644 --- a/include/libnfnetlink_log/libnfnetlink_log.h +++ b/include/libnfnetlink_log/libnfnetlink_log.h @@ -11,7 +11,7 @@ #include #include -#include +#include struct nfulnl_handle -- cgit v1.2.3