[netfilter-cvslog] r3870 - in trunk/patch-o-matic-ng: . nfnetlink
nfnetlink/include nfnetlink/include/linux
laforge at netfilter.org
laforge at netfilter.org
Sat Apr 16 15:12:43 CEST 2005
Author: laforge at netfilter.org
Date: 2005-04-16 15:12:42 +0200 (Sat, 16 Apr 2005)
New Revision: 3870
Added:
trunk/patch-o-matic-ng/nfnetlink/
trunk/patch-o-matic-ng/nfnetlink/include/
trunk/patch-o-matic-ng/nfnetlink/include/linux/
trunk/patch-o-matic-ng/nfnetlink/include/linux/netfilter/
trunk/patch-o-matic-ng/nfnetlink/info
trunk/patch-o-matic-ng/nfnetlink/linux-2.6.patch
trunk/patch-o-matic-ng/nfnetlink/linux-2.6/
Log:
new nfnetlink patch
Added: trunk/patch-o-matic-ng/nfnetlink/info
===================================================================
--- trunk/patch-o-matic-ng/nfnetlink/info 2005-04-15 17:15:11 UTC (rev 3869)
+++ trunk/patch-o-matic-ng/nfnetlink/info 2005-04-16 13:12:42 UTC (rev 3870)
@@ -0,0 +1,5 @@
+Title: nfnetlink
+Author: Jay Schulist, Harald Welte, et.al.
+Status: Stable
+Repository: extra
+Requires: linux >= 2.6.0
Added: trunk/patch-o-matic-ng/nfnetlink/linux-2.6.patch
===================================================================
--- trunk/patch-o-matic-ng/nfnetlink/linux-2.6.patch 2005-04-15 17:15:11 UTC (rev 3869)
+++ trunk/patch-o-matic-ng/nfnetlink/linux-2.6.patch 2005-04-16 13:12:42 UTC (rev 3870)
@@ -0,0 +1,519 @@
+Index: linux-2.6.12-rc2-ctnl/include/linux/netfilter/nfnetlink.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.12-rc2-ctnl/include/linux/netfilter/nfnetlink.h 2005-04-15 18:40:38.000000000 +0200
+@@ -0,0 +1,124 @@
++#ifndef _NFNETLINK_H
++#define _NFNETLINK_H
++#include <linux/types.h>
++
++/* 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
++{
++ unsigned short nfa_len;
++ unsigned short nfa_type;
++};
++
++#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))
++
++/* General form of address family dependent message.
++ */
++struct nfgenmsg {
++ unsigned char nfgen_family;
++};
++
++#define NFM_NFA(n) ((struct nfattr *)(((char *)(n)) \
++ + NLMSG_ALIGN(sizeof(struct nfgenmsg))))
++#define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg))
++
++
++/* Now it's uses NETLINK_FIREWALL */
++#ifndef NETLINK_NETFILTER
++#define NETLINK_NETFILTER 3
++#endif
++
++/* netfilter netlink message types are split in two pieces:
++ * 8 bit subsystem, 8bit operation.
++ */
++
++#define NFNL_SUBSYS_ID(x) ((x & 0xff00) >> 8)
++#define NFNL_MSG_TYPE(x) (x & 0x00ff)
++
++enum nfnl_subsys_id {
++ NFNL_SUBSYS_NONE = 0,
++ NFNL_SUBSYS_CTNETLINK,
++ NFNL_SUBSYS_CTNETLINK_EXP,
++ NFNL_SUBSYS_IPTNETLINK,
++ NFNL_SUBSYS_QUEUE,
++ NFNL_SUBSYS_ULOG,
++ NFNL_SUBSYS_COUNT,
++};
++
++#ifdef __KERNEL__
++
++#include <linux/capability.h>
++
++struct nfnl_callback
++{
++ kernel_cap_t cap_required; /* capabilities required for this msg */
++ int (*call)(struct sock *nl, struct sk_buff *skb,
++ struct nlmsghdr *nlh, int *errp);
++};
++
++struct nfnetlink_subsystem
++{
++ /* Internal use. */
++ struct list_head list;
++
++ const char *name;
++ __u8 subsys_id; /* nfnetlink subsystem ID */
++ __u8 cb_count; /* number of callbacks */
++ u_int32_t attr_count; /* number of nfattr's */
++ struct nfnl_callback cb[0]; /* 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 struct semaphore nfnl_sem;
++#define nfnl_exlock() do { } while(0)
++#define nfnl_exunlock() do { } while(0)
++#define nfnl_exlock_nowait() (0)
++
++#define nfnl_shlock() down(&nfnl_sem)
++#define nfnl_shlock_nowait() down_trylock(&nfnl_sem)
++
++#ifndef CONFIG_NF_NETLINK
++#define nfnl_shunlock() up(&nfnl_sem)
++#else
++#define nfnl_shunlock() do { up(&nfnl_sem); \
++ if(nfnl && nfnl->receive_queue.qlen) \
++ nfnl->data_ready(nfnl, 0); \
++ } while(0)
++#endif
++
++extern void nfnl_lock(void);
++extern void nfnl_unlock(void);
++
++extern struct nfnetlink_subsystem *nfnetlink_subsys_alloc(int cb_count);
++extern int nfnetlink_subsys_register(struct nfnetlink_subsystem *n);
++extern int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n);
++
++extern int nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
++ struct nlmsghdr *nlh,
++ struct nfattr *cda[]);
++extern int nfattr_parse(struct nfattr *tb[], int maxattr,
++ struct nfattr *nfa, int len);
++extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
++ int echo);
++
++#endif /* __KERNEL__ */
++#endif /* _NFNETLINK_H */
+Index: linux-2.6.12-rc2-ctnl/net/netfilter/nfnetlink.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.12-rc2-ctnl/net/netfilter/nfnetlink.c 2005-04-15 18:40:38.000000000 +0200
+@@ -0,0 +1,345 @@
++/* Netfilter messages via netlink socket. Allows for user space
++ * protocol helpers and general trouble making from userspace.
++ *
++ * (C) 2001 by Jay Schulist <jschlst at samba.org>,
++ * (C) 2002 by Harald Welte <laforge at gnumonks.org>
++ *
++ * Initial netfilter messages via netlink development funded and
++ * generally made possible by Network Robots, Inc. (www.networkrobots.com)
++ *
++ * Further development of this code funded by Astaro AG (http://www.astaro.com)
++ *
++ * This software may be used and distributed according to the terms
++ * of the GNU General Public License, incorporated herein by reference.
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/socket.h>
++#include <linux/kernel.h>
++#include <linux/major.h>
++#include <linux/sched.h>
++#include <linux/timer.h>
++#include <linux/string.h>
++#include <linux/sockios.h>
++#include <linux/net.h>
++#include <linux/fcntl.h>
++#include <linux/skbuff.h>
++#include <asm/uaccess.h>
++#include <asm/system.h>
++#include <net/sock.h>
++#include <linux/init.h>
++#include <linux/spinlock.h>
++#include <linux/list.h>
++
++#include <linux/netfilter.h>
++#include <linux/netlink.h>
++#include <linux/netfilter/nfnetlink.h>
++
++MODULE_LICENSE("GPL");
++
++static char __initdata nfversion[] = "0.12";
++
++#if 1
++#define DEBUGP printk
++#else
++#define DEBUGP(format, args...)
++#endif
++
++static struct sock *nfnl = NULL;
++static LIST_HEAD(subsys_list);
++static struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];
++DECLARE_MUTEX(nfnl_sem);
++
++void nfnl_lock(void)
++{
++ nfnl_shlock();
++ nfnl_exlock();
++}
++
++void nfnl_unlock(void)
++{
++ nfnl_exunlock();
++ nfnl_shunlock();
++}
++
++struct nfnetlink_subsystem *nfnetlink_subsys_alloc(int cb_count)
++{
++ int size;
++ struct nfnetlink_subsystem *ss;
++
++ size = sizeof(struct nfnetlink_subsystem)
++ + (cb_count * sizeof(struct nfnl_callback));
++
++ ss = kmalloc(size, GFP_KERNEL);
++ if (!ss)
++ return NULL;
++ memset(ss, 0, size);
++
++ return ss;
++}
++
++int nfnetlink_subsys_register(struct nfnetlink_subsystem *n)
++{
++ DEBUGP("registering subsystem ID %u\n", n->subsys_id);
++
++ nfnl_lock();
++ list_add(&n->list, &subsys_list);
++ subsys_table[n->subsys_id] = n;
++ nfnl_unlock();
++
++ return 0;
++}
++
++int nfnetlink_subsys_unregister(struct nfnetlink_subsystem *n)
++{
++ DEBUGP("unregistering subsystem ID %u\n", n->subsys_id);
++
++ nfnl_lock();
++ subsys_table[n->subsys_id] = NULL;
++ list_del(&n->list);
++ nfnl_unlock();
++
++ return 0;
++}
++
++struct nfnl_callback *nfnetlink_find_client(u_int16_t nlmsg_type)
++{
++ struct nfnetlink_subsystem *ss;
++ u_int8_t subsys_id = NFNL_SUBSYS_ID(nlmsg_type);
++ u_int8_t type = NFNL_MSG_TYPE(nlmsg_type);
++
++ if (subsys_id >= NFNL_SUBSYS_COUNT
++ || subsys_table[subsys_id] == NULL)
++ return NULL;
++
++ ss = subsys_table[subsys_id];
++
++ if (type >= ss->cb_count) {
++ DEBUGP("msgtype %u >= %u, returning\n", type, ss->cb_count);
++ return NULL;
++ }
++
++ return &ss->cb[type];
++}
++
++void __nfa_fill(struct sk_buff *skb, int attrtype, int attrlen,
++ const void *data)
++{
++ struct nfattr *nfa;
++ int size = NFA_LENGTH(attrlen);
++
++ nfa = (struct nfattr *)skb_put(skb, NFA_ALIGN(size));
++ nfa->nfa_type = attrtype;
++ nfa->nfa_len = size;
++ memcpy(NFA_DATA(nfa), data, attrlen);
++}
++
++int nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len)
++{
++ memset(tb, 0, sizeof(struct nfattr *) * maxattr);
++
++ while (NFA_OK(nfa, len)) {
++ unsigned flavor = nfa->nfa_type;
++ if (flavor && flavor <= maxattr)
++ tb[flavor-1] = nfa;
++ nfa = NFA_NEXT(nfa, len);
++ }
++
++ return 0;
++}
++
++/**
++ * nfnetlink_check_attributes - check and parse nfnetlink attributes
++ *
++ * subsys: nfnl subsystem for which this message is to be parsed
++ * nlmsghdr: netlink message to be checked/parsed
++ * cda: array of pointers, needs to be at least subsys->attr_count big
++ *
++ */
++int
++nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
++ struct nlmsghdr *nlh, struct nfattr *cda[])
++{
++ int min_len;
++
++ memset(cda, 0, sizeof(struct nfattr *) * subsys->attr_count);
++
++ /* check attribute lengths. */
++ min_len = sizeof(struct nfgenmsg);
++ if (nlh->nlmsg_len < min_len)
++ return -EINVAL;
++
++ if (nlh->nlmsg_len > min_len) {
++ struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
++ int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
++
++ while (NFA_OK(attr, attrlen)) {
++ unsigned flavor = attr->nfa_type;
++ if (flavor) {
++ if (flavor > subsys->attr_count)
++ return -EINVAL;
++ cda[flavor - 1] = attr;
++ }
++ attr = NFA_NEXT(attr, attrlen);
++ }
++ } else
++ return -EINVAL;
++
++ return 0;
++}
++
++int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
++{
++ int allocation = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
++ int err = 0;
++
++ NETLINK_CB(skb).dst_groups = group;
++ if (echo)
++ atomic_inc(&skb->users);
++ netlink_broadcast(nfnl, skb, pid, group, allocation);
++ if (echo)
++ err = netlink_unicast(nfnl, skb, pid, MSG_DONTWAIT);
++
++ return err;
++}
++
++/* Process one complete nfnetlink message. */
++static inline int nfnetlink_rcv_msg(struct sk_buff *skb,
++ struct nlmsghdr *nlh, int *errp)
++{
++ struct nfnl_callback *nc;
++ int type, err = 0;
++
++ DEBUGP("entered; subsys=%u, msgtype=%u\n",
++ NFNL_SUBSYS_ID(nlh->nlmsg_type),
++ NFNL_MSG_TYPE(nlh->nlmsg_type));
++
++ /* Only requests are handled by kernel now. */
++ if (!(nlh->nlmsg_flags & NLM_F_REQUEST)) {
++ DEBUGP("received non-request message\n");
++ return 0;
++ }
++
++ /* Unknown message: reply with EINVAL */
++ type = nlh->nlmsg_type;
++ if (NFNL_SUBSYS_ID(type) > NFNL_SUBSYS_COUNT) {
++ DEBUGP("subsys_id > subsys_count\n");
++ goto err_inval;
++ }
++
++ /* All the messages must have at least 1 byte length */
++ if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(struct nfgenmsg))) {
++ DEBUGP("received message was too short\n");
++ return 0;
++ }
++
++ nc = nfnetlink_find_client(type);
++ if (!nc) {
++ DEBUGP("unable to find client for type %d\n", type);
++ goto err_inval;
++ }
++
++ if (nc->cap_required &&
++ !cap_raised(NETLINK_CB(skb).eff_cap, nc->cap_required)) {
++ DEBUGP("permission denied for type %d\n", type);
++ *errp = -EPERM;
++ return -1;
++ }
++
++ err = nc->call(nfnl, skb, nlh, errp);
++ *errp = err;
++ return err;
++
++err_inval:
++ *errp = -EINVAL;
++ return -1;
++}
++
++/* Process one packet of messages. */
++static inline int nfnetlink_rcv_skb(struct sk_buff *skb)
++{
++ int err;
++ struct nlmsghdr *nlh;
++
++ while (skb->len >= NLMSG_SPACE(0)) {
++ u32 rlen;
++
++ nlh = (struct nlmsghdr *)skb->data;
++ if (nlh->nlmsg_len < sizeof(struct nlmsghdr)
++ || skb->len < nlh->nlmsg_len)
++ return 0;
++ rlen = NLMSG_ALIGN(nlh->nlmsg_len);
++ if (rlen > skb->len)
++ rlen = skb->len;
++ if (nfnetlink_rcv_msg(skb, nlh, &err)) {
++ if (!err)
++ return -1;
++ netlink_ack(skb, nlh, err);
++ } else
++ if (nlh->nlmsg_flags & NLM_F_ACK)
++ netlink_ack(skb, nlh, 0);
++ skb_pull(skb, rlen);
++ }
++
++ return 0;
++}
++
++static void nfnetlink_rcv(struct sock *sk, int len)
++{
++ do {
++ struct sk_buff *skb;
++
++ if (nfnl_shlock_nowait())
++ return;
++
++ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
++ if (nfnetlink_rcv_skb(skb)) {
++ if (skb->len)
++ skb_queue_head(&sk->sk_receive_queue,
++ skb);
++ else
++ kfree_skb(skb);
++ break;
++ }
++ kfree_skb(skb);
++ }
++
++ up(&nfnl_sem);
++ } while(nfnl && nfnl->sk_receive_queue.qlen);
++}
++
++void __exit nfnetlink_exit(void)
++{
++ printk("Netfilter removing netlink socket.\n");
++ sock_release(nfnl->sk_socket);
++ return;
++}
++
++int __init nfnetlink_init(void)
++{
++ int i;
++ printk("Netfilter messages via NETLINK v%s.\n", nfversion);
++
++ for (i = 0; i < NFNL_SUBSYS_COUNT; i++)
++ subsys_table[i] = NULL;
++
++ nfnl = netlink_kernel_create(NETLINK_NETFILTER, nfnetlink_rcv);
++ if (!nfnl) {
++ printk(KERN_ERR "cannot initialize nfnetlink!\n");
++ return -1;
++ }
++
++ return 0;
++}
++
++module_init(nfnetlink_init);
++module_exit(nfnetlink_exit);
++
++EXPORT_SYMBOL_GPL(nfnetlink_subsys_alloc);
++EXPORT_SYMBOL_GPL(nfnetlink_subsys_register);
++EXPORT_SYMBOL_GPL(nfnetlink_subsys_unregister);
++EXPORT_SYMBOL_GPL(nfnetlink_check_attributes);
++EXPORT_SYMBOL_GPL(nfnetlink_send);
++EXPORT_SYMBOL_GPL(__nfa_fill);
+Index: linux-2.6.12-rc2-ctnl/net/netfilter/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.12-rc2-ctnl/net/netfilter/Makefile 2005-04-15 18:40:38.000000000 +0200
+@@ -0,0 +1 @@
++obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o
+Index: linux-2.6.12-rc2-ctnl/net/netfilter/Kconfig
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.12-rc2-ctnl/net/netfilter/Kconfig 2005-04-16 11:58:03.000000000 +0200
+@@ -0,0 +1,5 @@
++config NETFILTER_NETLINK
++ tristate "Netfilter netlink interface"
++ help
++ If this option is enabled, the kernel will include support
++ for the new netfilter netlink interface.
+Index: linux-2.6.12-rc2-ctnl/net/Makefile
+===================================================================
+--- linux-2.6.12-rc2-ctnl.orig/net/Makefile 2005-04-16 14:59:16.000000000 +0200
++++ linux-2.6.12-rc2-ctnl/net/Makefile 2005-04-16 14:59:30.000000000 +0200
+@@ -16,6 +16,7 @@
+ obj-$(CONFIG_LLC) += llc/
+ obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/
+ obj-$(CONFIG_INET) += ipv4/
++obj-$(CONFIG_NETFILTER) += netfilter/
+ obj-$(CONFIG_XFRM) += xfrm/
+ obj-$(CONFIG_UNIX) += unix/
+ ifneq ($(CONFIG_IPV6),)
+Index: linux-2.6.12-rc2-ctnl/net/Kconfig
+===================================================================
+--- linux-2.6.12-rc2-ctnl.orig/net/Kconfig 2005-04-16 14:59:16.000000000 +0200
++++ linux-2.6.12-rc2-ctnl/net/Kconfig 2005-04-16 14:59:30.000000000 +0200
+@@ -203,6 +203,7 @@
+ source "net/ipv6/netfilter/Kconfig"
+ source "net/decnet/netfilter/Kconfig"
+ source "net/bridge/netfilter/Kconfig"
++source "net/netfilter/Kconfig"
+
+ endif
+
More information about the netfilter-cvslog
mailing list