From 646df1a88eceeab23750c700847198f2f02b4e69 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: Sun, 9 Oct 2005 15:46:20 +0000 Subject: rename libnfnetlink_queue to libnetfilter_queue --- include/Makefile.am | 2 +- include/libnetfilter_queue/Makefile.am | 3 + include/libnetfilter_queue/libipq.h | 88 +++++++++++++++++++++++++ include/libnetfilter_queue/libnfnetlink_queue.h | 87 ++++++++++++++++++++++++ include/libnfnetlink_queue/Makefile.am | 3 - include/libnfnetlink_queue/libipq.h | 88 ------------------------- include/libnfnetlink_queue/libnfnetlink_queue.h | 87 ------------------------ src/Makefile.am | 10 +-- src/libipq_compat.c | 6 +- src/libnfnetlink_queue.c | 2 +- utils/Makefile.am | 2 +- utils/nfqnl_test.c | 2 +- 12 files changed, 190 insertions(+), 190 deletions(-) create mode 100644 include/libnetfilter_queue/Makefile.am create mode 100644 include/libnetfilter_queue/libipq.h create mode 100644 include/libnetfilter_queue/libnfnetlink_queue.h delete mode 100644 include/libnfnetlink_queue/Makefile.am delete mode 100644 include/libnfnetlink_queue/libipq.h delete mode 100644 include/libnfnetlink_queue/libnfnetlink_queue.h diff --git a/include/Makefile.am b/include/Makefile.am index 4040f9f..42fd733 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = libnfnetlink_queue +SUBDIRS = libnetfilter_queue diff --git a/include/libnetfilter_queue/Makefile.am b/include/libnetfilter_queue/Makefile.am new file mode 100644 index 0000000..fc9a2f6 --- /dev/null +++ b/include/libnetfilter_queue/Makefile.am @@ -0,0 +1,3 @@ + +pkginclude_HEADERS = libnetfilter_queue.h libipq.h + diff --git a/include/libnetfilter_queue/libipq.h b/include/libnetfilter_queue/libipq.h new file mode 100644 index 0000000..06c10c1 --- /dev/null +++ b/include/libnetfilter_queue/libipq.h @@ -0,0 +1,88 @@ +/* + * libipq.h + * + * IPQ library for userspace. + * + * Author: James Morris + * + * Copyright (c) 2000-2001 Netfilter Core Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#ifndef _LIBIPQ_H +#define _LIBIPQ_H + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef KERNEL_64_USERSPACE_32 +#include "ip_queue_64.h" +typedef u_int64_t ipq_id_t; +#else +#include +typedef unsigned long ipq_id_t; +#endif + +#ifdef DEBUG_LIBIPQ +#include +#define LDEBUG(x...) fprintf(stderr, ## x) +#else +#define LDEBUG(x...) +#endif /* DEBUG_LIBIPQ */ + +/* FIXME: glibc sucks */ +#ifndef MSG_TRUNC +#define MSG_TRUNC 0x20 +#endif + +struct ipq_handle +{ + struct nfqnl_handle *nfqnlh; + struct nfqnl_q_handle *qh; + u_int8_t family; + u_int8_t blocking; +}; + +struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); + +int ipq_destroy_handle(struct ipq_handle *h); + +ssize_t ipq_read(const struct ipq_handle *h, + unsigned char *buf, size_t len, int timeout); + +int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); + +ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); + +int ipq_message_type(const unsigned char *buf); + +int ipq_get_msgerr(const unsigned char *buf); + +int ipq_set_verdict(const struct ipq_handle *h, + ipq_id_t id, + unsigned int verdict, + size_t data_len, + unsigned char *buf); + +int ipq_ctl(const struct ipq_handle *h, int request, ...); + +char *ipq_errstr(void); +void ipq_perror(const char *s); + +#endif /* _LIBIPQ_H */ + diff --git a/include/libnetfilter_queue/libnfnetlink_queue.h b/include/libnetfilter_queue/libnfnetlink_queue.h new file mode 100644 index 0000000..9c2b40d --- /dev/null +++ b/include/libnetfilter_queue/libnfnetlink_queue.h @@ -0,0 +1,87 @@ +/* libnfqnetlink.h: Header file for the Netfilter Queue library. + * + * (C) 2005 by Harald Welte + * + * + * Changelog : + * (2005/08/11) added parsing function (Eric Leblond ) + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + */ + +#ifndef __LIBCTNETLINK_H +#define __LIBCTNETLINK_H + +#include + +#include +#include + +struct nfqnl_handle; +struct nfqnl_q_handle; + +extern int nfqnl_errno; + +extern struct nfnl_handle *nfqnl_nfnlh(struct nfqnl_handle *h); +extern int nfqnl_fd(struct nfqnl_handle *h); + +typedef int nfqnl_callback(struct nfqnl_q_handle *gh, struct nfgenmsg *nfmsg, + struct nfattr *nfa[], void *data); + + +extern struct nfqnl_handle *nfqnl_open(void); +extern int nfqnl_close(struct nfqnl_handle *h); + +extern int nfqnl_bind_pf(struct nfqnl_handle *h, u_int16_t pf); +extern int nfqnl_unbind_pf(struct nfqnl_handle *h, u_int16_t pf); + +extern struct nfqnl_q_handle *nfqnl_create_queue(struct nfqnl_handle *h, + u_int16_t num, + nfqnl_callback *cb, + void *data); +extern int nfqnl_destroy_queue(struct nfqnl_q_handle *qh); + +extern int nfqnl_handle_packet(struct nfqnl_handle *h, char *buf, int len); + +extern int nfqnl_set_mode(struct nfqnl_q_handle *qh, + u_int8_t mode, unsigned int len); + +extern int nfqnl_set_verdict(struct nfqnl_q_handle *qh, + u_int32_t id, + u_int32_t verdict, + u_int32_t data_len, + unsigned char *buf); + +extern int nfqnl_set_verdict_mark(struct nfqnl_q_handle *qh, + u_int32_t id, + u_int32_t verdict, + u_int32_t mark, + u_int32_t datalen, + unsigned char *buf); + +/* message parsing function */ + +extern struct nfqnl_msg_packet_hdr * + nfqnl_get_msg_packet_hdr(struct nfattr *nfa[]); + +extern u_int32_t nfqnl_get_nfmark(struct nfattr *nfa[]); + +extern struct nfqnl_msg_packet_timestamp * + nfqnl_get_timestamp(struct nfattr *nfa[]); + +/* return 0 if not set */ +extern u_int32_t nfqnl_get_indev(struct nfattr *nfa[]); +extern u_int32_t nfqnl_get_physindev(struct nfattr *nfa[]); +extern u_int32_t nfqnl_get_outdev(struct nfattr *nfa[]); +extern u_int32_t nfqnl_get_physoutdev(struct nfattr *nfa[]); + +extern struct nfqnl_msg_packet_hw *nfqnl_get_packet_hw(struct nfattr *nfa[]); + +/* return 0 if problem */ +extern int nfqnl_get_payload(struct nfattr *nfa[], + char ** data, unsigned int* datalen); + + + +#endif /* __LIBNFQNETLINK_H */ diff --git a/include/libnfnetlink_queue/Makefile.am b/include/libnfnetlink_queue/Makefile.am deleted file mode 100644 index ebdfd5c..0000000 --- a/include/libnfnetlink_queue/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -pkginclude_HEADERS = libnfnetlink_queue.h libipq.h - diff --git a/include/libnfnetlink_queue/libipq.h b/include/libnfnetlink_queue/libipq.h deleted file mode 100644 index 06c10c1..0000000 --- a/include/libnfnetlink_queue/libipq.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * libipq.h - * - * IPQ library for userspace. - * - * Author: James Morris - * - * Copyright (c) 2000-2001 Netfilter Core Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ -#ifndef _LIBIPQ_H -#define _LIBIPQ_H - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef KERNEL_64_USERSPACE_32 -#include "ip_queue_64.h" -typedef u_int64_t ipq_id_t; -#else -#include -typedef unsigned long ipq_id_t; -#endif - -#ifdef DEBUG_LIBIPQ -#include -#define LDEBUG(x...) fprintf(stderr, ## x) -#else -#define LDEBUG(x...) -#endif /* DEBUG_LIBIPQ */ - -/* FIXME: glibc sucks */ -#ifndef MSG_TRUNC -#define MSG_TRUNC 0x20 -#endif - -struct ipq_handle -{ - struct nfqnl_handle *nfqnlh; - struct nfqnl_q_handle *qh; - u_int8_t family; - u_int8_t blocking; -}; - -struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); - -int ipq_destroy_handle(struct ipq_handle *h); - -ssize_t ipq_read(const struct ipq_handle *h, - unsigned char *buf, size_t len, int timeout); - -int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); - -ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); - -int ipq_message_type(const unsigned char *buf); - -int ipq_get_msgerr(const unsigned char *buf); - -int ipq_set_verdict(const struct ipq_handle *h, - ipq_id_t id, - unsigned int verdict, - size_t data_len, - unsigned char *buf); - -int ipq_ctl(const struct ipq_handle *h, int request, ...); - -char *ipq_errstr(void); -void ipq_perror(const char *s); - -#endif /* _LIBIPQ_H */ - diff --git a/include/libnfnetlink_queue/libnfnetlink_queue.h b/include/libnfnetlink_queue/libnfnetlink_queue.h deleted file mode 100644 index 9c2b40d..0000000 --- a/include/libnfnetlink_queue/libnfnetlink_queue.h +++ /dev/null @@ -1,87 +0,0 @@ -/* libnfqnetlink.h: Header file for the Netfilter Queue library. - * - * (C) 2005 by Harald Welte - * - * - * Changelog : - * (2005/08/11) added parsing function (Eric Leblond ) - * - * This software may be used and distributed according to the terms - * of the GNU General Public License, incorporated herein by reference. - */ - -#ifndef __LIBCTNETLINK_H -#define __LIBCTNETLINK_H - -#include - -#include -#include - -struct nfqnl_handle; -struct nfqnl_q_handle; - -extern int nfqnl_errno; - -extern struct nfnl_handle *nfqnl_nfnlh(struct nfqnl_handle *h); -extern int nfqnl_fd(struct nfqnl_handle *h); - -typedef int nfqnl_callback(struct nfqnl_q_handle *gh, struct nfgenmsg *nfmsg, - struct nfattr *nfa[], void *data); - - -extern struct nfqnl_handle *nfqnl_open(void); -extern int nfqnl_close(struct nfqnl_handle *h); - -extern int nfqnl_bind_pf(struct nfqnl_handle *h, u_int16_t pf); -extern int nfqnl_unbind_pf(struct nfqnl_handle *h, u_int16_t pf); - -extern struct nfqnl_q_handle *nfqnl_create_queue(struct nfqnl_handle *h, - u_int16_t num, - nfqnl_callback *cb, - void *data); -extern int nfqnl_destroy_queue(struct nfqnl_q_handle *qh); - -extern int nfqnl_handle_packet(struct nfqnl_handle *h, char *buf, int len); - -extern int nfqnl_set_mode(struct nfqnl_q_handle *qh, - u_int8_t mode, unsigned int len); - -extern int nfqnl_set_verdict(struct nfqnl_q_handle *qh, - u_int32_t id, - u_int32_t verdict, - u_int32_t data_len, - unsigned char *buf); - -extern int nfqnl_set_verdict_mark(struct nfqnl_q_handle *qh, - u_int32_t id, - u_int32_t verdict, - u_int32_t mark, - u_int32_t datalen, - unsigned char *buf); - -/* message parsing function */ - -extern struct nfqnl_msg_packet_hdr * - nfqnl_get_msg_packet_hdr(struct nfattr *nfa[]); - -extern u_int32_t nfqnl_get_nfmark(struct nfattr *nfa[]); - -extern struct nfqnl_msg_packet_timestamp * - nfqnl_get_timestamp(struct nfattr *nfa[]); - -/* return 0 if not set */ -extern u_int32_t nfqnl_get_indev(struct nfattr *nfa[]); -extern u_int32_t nfqnl_get_physindev(struct nfattr *nfa[]); -extern u_int32_t nfqnl_get_outdev(struct nfattr *nfa[]); -extern u_int32_t nfqnl_get_physoutdev(struct nfattr *nfa[]); - -extern struct nfqnl_msg_packet_hw *nfqnl_get_packet_hw(struct nfattr *nfa[]); - -/* return 0 if problem */ -extern int nfqnl_get_payload(struct nfattr *nfa[], - char ** data, unsigned int* datalen); - - - -#endif /* __LIBNFQNETLINK_H */ diff --git a/src/Makefile.am b/src/Makefile.am index c75d708..d9f1f75 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} AM_CFLAGS=-fPIC -Wall LIBS= -lib_LTLIBRARIES = libnfnetlink_queue.la libnfnetlink_queue_libipq.la +lib_LTLIBRARIES = libnetfilter_queue.la libnetfilter_queue_libipq.la -libnfnetlink_queue_la_LDFLAGS = -Wc,-nostartfiles -libnfnetlink_queue_la_SOURCES = libnfnetlink_queue.c +libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles +libnetfilter_queue_la_SOURCES = libnetfilter_queue.c -libnfnetlink_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles -libnfnetlink_queue_libipq_la_SOURCES = libipq_compat.c +libnetfilter_queue_libipq_la_LDFLAGS = -Wc,-nostartfiles +libnetfilter_queue_libipq_la_SOURCES = libipq_compat.c diff --git a/src/libipq_compat.c b/src/libipq_compat.c index d263aed..86481ac 100644 --- a/src/libipq_compat.c +++ b/src/libipq_compat.c @@ -1,5 +1,5 @@ /* - * libipq - backwards compatibility library for libnfnetlink_queue + * libipq - backwards compatibility library for libnetfilter_queue * * (C) 2005 by Harald Welte * @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include /**************************************************************************** * diff --git a/src/libnfnetlink_queue.c b/src/libnfnetlink_queue.c index 10ece48..8e84c50 100644 --- a/src/libnfnetlink_queue.c +++ b/src/libnfnetlink_queue.c @@ -27,7 +27,7 @@ #include #include -#include +#include struct nfqnl_handle { diff --git a/utils/Makefile.am b/utils/Makefile.am index c7ed00b..4ccc1ad 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} bin_PROGRAMS = nfqnl_test nfqnl_test_SOURCES = nfqnl_test.c -nfqnl_test_LDADD = ../src/libnfnetlink_queue.la +nfqnl_test_LDADD = ../src/libnetfilter_queue.la nfqnl_test_LDFLAGS = -dynamic diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c index ae8c072..26de1c5 100644 --- a/utils/nfqnl_test.c +++ b/utils/nfqnl_test.c @@ -5,7 +5,7 @@ #include #include /* for NF_ACCEPT */ -#include +#include /* returns packet id */ static u_int32_t print_pkt (struct nfattr *tb[]) -- cgit v1.2.3