[libnfnetlink] update include files
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Sat May 31 12:53:40 CEST 2008
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnfnetlink.git;a=commit;h=75079aff51e977301771fbcb9f5ade0ff661b78b
commit 75079aff51e977301771fbcb9f5ade0ff661b78b
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue May 27 19:29:52 2008 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue May 27 19:29:52 2008 +0200
update include files
via 75079aff51e977301771fbcb9f5ade0ff661b78b (commit)
from 36d2ed3de20a37a1d5a970596e3f672537c36f49 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 75079aff51e977301771fbcb9f5ade0ff661b78b
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue May 27 19:29:52 2008 +0200
update include files
-----------------------------------------------------------------------
autogen.sh | 14 +++++
configure.in | 2 +-
include/libnfnetlink/Makefile.am | 2 +-
include/libnfnetlink/libnfnetlink.h | 4 +
include/libnfnetlink/linux_nfnetlink.h | 100 ++++----------------------------
5 files changed, 31 insertions(+), 91 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index d43dd49..c167563 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,10 +14,24 @@ include ()
TARGET=include/libnfnetlink/linux_nfnetlink.h
echo "Copying nfnetlink.h to linux_nfnetlink.h"
cp $INCLUDEDIR/netfilter/nfnetlink.h $TARGET
+ TMP=`mktemp`
+ sed 's/__be16/u_int16_t/g' $TARGET > $TMP
+ cp $TMP $TARGET
+ sed 's/#include <linux\/netfilter\/nfnetlink_compat\.h>/#include <libnfnetlink\/linux_nfnetlink_compat\.h>/g' $TARGET > $TMP
+ cp $TMP $TARGET
else
echo "can't find nfnetlink.h kernel file in $INCLUDEDIR"
exit 1
fi
+
+ if [ -f $INCLUDEDIR/netfilter/nfnetlink_compat.h ]
+ then
+ TARGET=include/libnfnetlink/linux_nfnetlink_compat.h
+ echo "Copying nfnetlink_compat.h to linux_nfnetlink_compat.h"
+ cp $INCLUDEDIR/netfilter/nfnetlink_compat.h $TARGET
+ else
+ echo "can't find nfnetlink.h kernel file in $INCLUDEDIR, ignoring"
+ fi
}
run ()
diff --git a/configure.in b/configure.in
index d8270f6..fba9635 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to create configure.
-AC_INIT(libnfnetlink, 0.0.37)
+AC_INIT(libnfnetlink, 0.0.38)
AC_CANONICAL_SYSTEM
diff --git a/include/libnfnetlink/Makefile.am b/include/libnfnetlink/Makefile.am
index 81e14c8..76128c8 100644
--- a/include/libnfnetlink/Makefile.am
+++ b/include/libnfnetlink/Makefile.am
@@ -1,3 +1,3 @@
-pkginclude_HEADERS = libnfnetlink.h linux_nfnetlink.h
+pkginclude_HEADERS = libnfnetlink.h linux_nfnetlink.h linux_nfnetlink_compat.h
diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h
index fea7611..3c64aac 100644
--- a/include/libnfnetlink/libnfnetlink.h
+++ b/include/libnfnetlink/libnfnetlink.h
@@ -219,10 +219,14 @@ int nlif_index2name(struct nlif_handle *nlif_handle,
#include <byteswap.h>
#if __BYTE_ORDER == __BIG_ENDIAN
+# ifndef __be64_to_cpu
# define __be64_to_cpu(x) (x)
+# endif
# else
# if __BYTE_ORDER == __LITTLE_ENDIAN
+# ifndef __be64_to_cpu
# define __be64_to_cpu(x) __bswap_64(x)
+# endif
# endif
#endif
diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h
index 0f9311d..76a8550 100644
--- a/include/libnfnetlink/linux_nfnetlink.h
+++ b/include/libnfnetlink/linux_nfnetlink.h
@@ -1,16 +1,7 @@
#ifndef _NFNETLINK_H
#define _NFNETLINK_H
#include <linux/types.h>
-
-#ifndef __KERNEL__
-/* nfnetlink groups: Up to 32 maximum - backwards compatibility for userspace */
-#define NF_NETLINK_CONNTRACK_NEW 0x00000001
-#define NF_NETLINK_CONNTRACK_UPDATE 0x00000002
-#define NF_NETLINK_CONNTRACK_DESTROY 0x00000004
-#define NF_NETLINK_CONNTRACK_EXP_NEW 0x00000008
-#define NF_NETLINK_CONNTRACK_EXP_UPDATE 0x00000010
-#define NF_NETLINK_CONNTRACK_EXP_DESTROY 0x00000020
-#endif
+#include <libnfnetlink/linux_nfnetlink_compat.h>
enum nfnetlink_groups {
NFNLGRP_NONE,
@@ -31,62 +22,16 @@ enum nfnetlink_groups {
};
#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)
-/* Generic structure for encapsulation optional netfilter information.
- * It is reminiscent of sockaddr, but with sa_family replaced
- * with attribute type.
- * ! This should someday be put somewhere generic as now rtnetlink and
- * ! nfnetlink use the same attributes methods. - J. Schulist.
- */
-
-struct nfattr
-{
- u_int16_t nfa_len;
- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest
- * bit to indicate whether the payload is nested */
-};
-
-/* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
- * rtnetlink.h, it's time to put this in a generic file */
-
-#define NFNL_NFA_NEST 0x8000
-#define NFA_TYPE(attr) ((attr)->nfa_type & 0x7fff)
-
-#define NFA_ALIGNTO 4
-#define NFA_ALIGN(len) (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1))
-#define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \
- && (nfa)->nfa_len <= (len))
-#define NFA_NEXT(nfa,attrlen) ((attrlen) -= NFA_ALIGN((nfa)->nfa_len), \
- (struct nfattr *)(((char *)(nfa)) + NFA_ALIGN((nfa)->nfa_len)))
-#define NFA_LENGTH(len) (NFA_ALIGN(sizeof(struct nfattr)) + (len))
-#define NFA_SPACE(len) NFA_ALIGN(NFA_LENGTH(len))
-#define NFA_DATA(nfa) ((void *)(((char *)(nfa)) + NFA_LENGTH(0)))
-#define NFA_PAYLOAD(nfa) ((int)((nfa)->nfa_len) - NFA_LENGTH(0))
-#define NFA_NEST(skb, type) \
-({ struct nfattr *__start = (struct nfattr *)skb_tail_pointer(skb); \
- NFA_PUT(skb, (NFNL_NFA_NEST | type), 0, NULL); \
- __start; })
-#define NFA_NEST_END(skb, start) \
-({ (start)->nfa_len = skb_tail_pointer(skb) - (unsigned char *)(start); \
- (skb)->len; })
-#define NFA_NEST_CANCEL(skb, start) \
-({ if (start) \
- skb_trim(skb, (unsigned char *) (start) - (skb)->data); \
- -1; })
-
/* General form of address family dependent message.
*/
struct nfgenmsg {
u_int8_t nfgen_family; /* AF_xxx */
u_int8_t version; /* nfnetlink version */
- __be16 res_id; /* resource id */
+ u_int16_t res_id; /* resource id */
};
#define NFNETLINK_V0 0
-#define NFM_NFA(n) ((struct nfattr *)(((char *)(n)) \
- + NLMSG_ALIGN(sizeof(struct nfgenmsg))))
-#define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
-
/* netfilter netlink message types are split in two pieces:
* 8 bit subsystem, 8bit operation.
*/
@@ -107,49 +52,26 @@ struct nfgenmsg {
#include <linux/netlink.h>
#include <linux/capability.h>
+#include <net/netlink.h>
struct nfnl_callback
{
int (*call)(struct sock *nl, struct sk_buff *skb,
- struct nlmsghdr *nlh, struct nfattr *cda[]);
- u_int16_t attr_count; /* number of nfattr's */
+ struct nlmsghdr *nlh, struct nlattr *cda[]);
+ const struct nla_policy *policy; /* netlink attribute policy */
+ const u_int16_t attr_count; /* number of nlattr's */
};
struct nfnetlink_subsystem
{
const char *name;
- __u8 subsys_id; /* nfnetlink subsystem ID */
- __u8 cb_count; /* number of callbacks */
- struct nfnl_callback *cb; /* callback for individual types */
+ __u8 subsys_id; /* nfnetlink subsystem ID */
+ __u8 cb_count; /* number of callbacks */
+ const struct nfnl_callback *cb; /* callback for individual types */
};
-extern void __nfa_fill(struct sk_buff *skb, int attrtype,
- int attrlen, const void *data);
-#define NFA_PUT(skb, attrtype, attrlen, data) \
-({ if (skb_tailroom(skb) < (int)NFA_SPACE(attrlen)) goto nfattr_failure; \
- __nfa_fill(skb, attrtype, attrlen, data); })
-
-extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
-extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);
-
-extern void nfattr_parse(struct nfattr *tb[], int maxattr,
- struct nfattr *nfa, int len);
-
-#define nfattr_parse_nested(tb, max, nfa) \
- nfattr_parse((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
-
-#define nfattr_bad_size(tb, max, cta_min) \
-({ int __i, __res = 0; \
- for (__i=0; __i<max; __i++) { \
- if (!cta_min[__i]) \
- continue; \
- if (tb[__i] && NFA_PAYLOAD(tb[__i]) < cta_min[__i]){ \
- __res = 1; \
- break; \
- } \
- } \
- __res; \
-})
+extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
+extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
extern int nfnetlink_has_listeners(unsigned int group);
extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
More information about the netfilter-cvslog
mailing list