/* address types */
-diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h.orig linux-2.6.22-520/include/linux/vserver/network.h.orig
---- linux-2.6.22-510/include/linux/vserver/network.h.orig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/vserver/network.h.orig 2008-02-20 04:13:12.000000000 -0500
-@@ -0,0 +1,144 @@
-+#ifndef _VX_NETWORK_H
-+#define _VX_NETWORK_H
-+
-+#include <linux/types.h>
-+
-+
-+#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
-+
-+
-+/* network flags */
-+
-+#define NXF_INFO_PRIVATE 0x00000008
-+
-+#define NXF_SINGLE_IP 0x00000100
-+#define NXF_LBACK_REMAP 0x00000200
-+#define NXF_LBACK_ALLOW 0x00000400
-+
-+#define NXF_HIDE_NETIF 0x02000000
-+#define NXF_HIDE_LBACK 0x04000000
-+
-+#define NXF_STATE_SETUP (1ULL << 32)
-+#define NXF_STATE_ADMIN (1ULL << 34)
-+
-+#define NXF_SC_HELPER (1ULL << 36)
-+#define NXF_PERSISTENT (1ULL << 38)
-+
-+#define NXF_ONE_TIME (0x0005ULL << 32)
-+
-+
-+#define NXF_INIT_SET (__nxf_init_set())
-+
-+static inline uint64_t __nxf_init_set(void) {
-+ return NXF_STATE_ADMIN
-+#ifdef CONFIG_VSERVER_AUTO_LBACK
-+ | NXF_LBACK_REMAP
-+ | NXF_HIDE_LBACK
-+#endif
-+#ifdef CONFIG_VSERVER_AUTO_SINGLE
-+ | NXF_SINGLE_IP
-+#endif
-+ | NXF_HIDE_NETIF;
-+}
-+
-+
-+/* network caps */
-+
-+#define NXC_RAW_ICMP 0x00000100
-+
-+
-+/* address types */
-+
-+#define NXA_TYPE_IPV4 0x0001
-+#define NXA_TYPE_IPV6 0x0002
-+
-+#define NXA_TYPE_NONE 0x0000
-+#define NXA_TYPE_ANY 0x00FF
-+
-+#define NXA_TYPE_ADDR 0x0010
-+#define NXA_TYPE_MASK 0x0020
-+#define NXA_TYPE_RANGE 0x0040
-+
-+#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
-+
-+#define NXA_MOD_BCAST 0x0100
-+#define NXA_MOD_LBACK 0x0200
-+
-+#define NXA_LOOPBACK 0x1000
-+
-+#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
-+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/list.h>
-+#include <linux/spinlock.h>
-+#include <linux/rcupdate.h>
-+#include <linux/in.h>
-+#include <linux/in6.h>
-+#include <asm/atomic.h>
-+
-+struct nx_addr_v4 {
-+ struct nx_addr_v4 *next;
-+ struct in_addr ip[2];
-+ struct in_addr mask;
-+ uint16_t type;
-+ uint16_t flags;
-+};
-+
-+struct nx_addr_v6 {
-+ struct nx_addr_v6 *next;
-+ struct in6_addr ip;
-+ struct in6_addr mask;
-+ uint32_t prefix;
-+ uint16_t type;
-+ uint16_t flags;
-+};
-+
-+struct nx_info {
-+ struct hlist_node nx_hlist; /* linked list of nxinfos */
-+ nid_t nx_id; /* vnet id */
-+ atomic_t nx_usecnt; /* usage count */
-+ atomic_t nx_tasks; /* tasks count */
-+ int nx_state; /* context state */
-+
-+ uint64_t nx_flags; /* network flag word */
-+ uint64_t nx_ncaps; /* network capabilities */
-+
-+ struct in_addr v4_lback; /* Loopback address */
-+ struct in_addr v4_bcast; /* Broadcast address */
-+ struct nx_addr_v4 v4; /* First/Single ipv4 address */
-+#ifdef CONFIG_IPV6
-+ struct nx_addr_v6 v6; /* First/Single ipv6 address */
-+#endif
-+ char nx_name[65]; /* network context name */
-+};
-+
-+
-+/* status flags */
-+
-+#define NXS_HASHED 0x0001
-+#define NXS_SHUTDOWN 0x0100
-+#define NXS_RELEASED 0x8000
-+
-+extern struct nx_info *lookup_nx_info(int);
-+
-+extern int get_nid_list(int, unsigned int *, int);
-+extern int nid_is_hashed(nid_t);
-+
-+extern int nx_migrate_task(struct task_struct *, struct nx_info *);
-+
-+extern long vs_net_change(struct nx_info *, unsigned int);
-+
-+struct sock;
-+
-+
-+#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
-+#ifdef CONFIG_IPV6
-+#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
-+#else
-+#define NX_IPV6(n) (0)
-+#endif
-+
-+#endif /* __KERNEL__ */
-+#endif /* _VX_NETWORK_H */
diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h
--- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-02-20 04:13:12.000000000 -0500
printk(KERN_WARNING "MARK: unknown mode %u\n",
markinfo->mode);
return 0;
-diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c.orig linux-2.6.22-520/net/netfilter/xt_MARK.c.orig
---- linux-2.6.22-510/net/netfilter/xt_MARK.c.orig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/net/netfilter/xt_MARK.c.orig 2008-02-20 06:54:56.000000000 -0500
-@@ -0,0 +1,284 @@
-+/* This is a module which is used for setting the NFMARK field of an skb. */
-+
-+/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/version.h>
-+#include <linux/skbuff.h>
-+#include <linux/ip.h>
-+#include <net/checksum.h>
-+#include <net/route.h>
-+#include <net/inet_hashtables.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_MARK.h>
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
-+MODULE_DESCRIPTION("ip[6]tables MARK modification module");
-+MODULE_ALIAS("ipt_MARK");
-+MODULE_ALIAS("ip6t_MARK");
-+
-+static inline u_int16_t
-+get_dst_port(struct nf_conntrack_tuple *tuple)
-+{
-+ switch (tuple->dst.protonum) {
-+ case IPPROTO_GRE:
-+ /* XXX Truncate 32-bit GRE key to 16 bits */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
-+ return tuple->dst.u.gre.key;
-+#else
-+ return htons(ntohl(tuple->dst.u.gre.key));
-+#endif
-+ case IPPROTO_ICMP:
-+ /* Bind on ICMP echo ID */
-+ return tuple->src.u.icmp.id;
-+ case IPPROTO_TCP:
-+ return tuple->dst.u.tcp.port;
-+ case IPPROTO_UDP:
-+ return tuple->dst.u.udp.port;
-+ default:
-+ return tuple->dst.u.all;
-+ }
-+}
-+
-+static inline u_int16_t
-+get_src_port(struct nf_conntrack_tuple *tuple)
-+{
-+ switch (tuple->dst.protonum) {
-+ case IPPROTO_GRE:
-+ /* XXX Truncate 32-bit GRE key to 16 bits */
-+ return htons(ntohl(tuple->src.u.gre.key));
-+ case IPPROTO_ICMP:
-+ /* Bind on ICMP echo ID */
-+ return tuple->src.u.icmp.id;
-+ case IPPROTO_TCP:
-+ return tuple->src.u.tcp.port;
-+ case IPPROTO_UDP:
-+ return tuple->src.u.udp.port;
-+ default:
-+ return tuple->src.u.all;
-+ }
-+}
-+
-+static unsigned int
-+target_v0(struct sk_buff **pskb,
-+ const struct net_device *in,
-+ const struct net_device *out,
-+ unsigned int hooknum,
-+ const struct xt_target *target,
-+ const void *targinfo)
-+{
-+ const struct xt_mark_target_info *markinfo = targinfo;
-+
-+ (*pskb)->mark = markinfo->mark;
-+ return XT_CONTINUE;
-+}
-+
-+static unsigned int
-+target_v1(struct sk_buff **pskb,
-+ const struct net_device *in,
-+ const struct net_device *out,
-+ unsigned int hooknum,
-+ const struct xt_target *target,
-+ const void *targinfo)
-+{
-+ const struct xt_mark_target_info_v1 *markinfo = targinfo;
-+ int mark = -1;
-+
-+ switch (markinfo->mode) {
-+ case XT_MARK_SET:
-+ mark = markinfo->mark;
-+ break;
-+
-+ case XT_MARK_AND:
-+ mark = (*pskb)->mark & markinfo->mark;
-+ break;
-+
-+ case XT_MARK_OR:
-+ mark = (*pskb)->mark | markinfo->mark;
-+ break;
-+
-+ case XT_MARK_COPYXID: {
-+ enum ip_conntrack_info ctinfo;
-+ struct sock *connection_sk;
-+ int dif;
-+
-+ struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);
-+ extern struct inet_hashinfo tcp_hashinfo;
-+ enum ip_conntrack_dir dir;
-+ if (!ct)
-+ break;
-+
-+ dir = CTINFO2DIR(ctinfo);
-+ u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
-+ u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple);
-+ u_int16_t proto = ct->tuplehash[dir].tuple.dst.protonum;
-+
-+ u_int32_t ip;
-+ u_int16_t port;
-+
-+ dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
-+ ip = ct->tuplehash[dir].tuple.dst.u3.ip;
-+ port = get_dst_port(&ct->tuplehash[dir].tuple);
-+
-+ if (proto == 1) {
-+ if (((*pskb)->mark!=-1) && (*pskb)->mark)
-+ ct->xid[0]=(*pskb)->mark;
-+ if (ct->xid[0])
-+ mark = ct->xid[0];
-+ printk(KERN_CRIT "%d %d\n",ct->xid[0],(*pskb)->mark);
-+
-+ }
-+ else if (proto == 6) {
-+ if ((*pskb)->sk)
-+ connection_sk = (*pskb)->sk;
-+ else {
-+ connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
-+ }
-+
-+ if (connection_sk) {
-+ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
-+ ct->xid[!dir]=connection_sk->sk_xid;
-+ if (connection_sk->sk_xid != 0)
-+ mark = connection_sk->sk_xid;
-+ if (connection_sk != (*pskb)->sk)
-+ sock_put(connection_sk);
-+ }
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (mark != -1)
-+ (*pskb)->mark = mark;
-+ return XT_CONTINUE;
-+}
-+
-+
-+static int
-+checkentry_v0(const char *tablename,
-+ const void *entry,
-+ const struct xt_target *target,
-+ void *targinfo,
-+ unsigned int hook_mask)
-+{
-+ struct xt_mark_target_info *markinfo = targinfo;
-+
-+ if (markinfo->mark > 0xffffffff) {
-+ printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
-+ return 0;
-+ }
-+ return 1;
-+}
-+
-+static int
-+checkentry_v1(const char *tablename,
-+ const void *entry,
-+ const struct xt_target *target,
-+ void *targinfo,
-+ unsigned int hook_mask)
-+{
-+ struct xt_mark_target_info_v1 *markinfo = targinfo;
-+
-+ if (markinfo->mode != XT_MARK_SET
-+ && markinfo->mode != XT_MARK_AND
-+ && markinfo->mode != XT_MARK_OR
-+ && markinfo->mode != XT_MARK_COPYXID) {
-+ printk(KERN_WARNING "MARK: unknown mode %u\n",
-+ markinfo->mode);
-+ return 0;
-+ }
-+ if (markinfo->mark > 0xffffffff) {
-+ printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
-+ return 0;
-+ }
-+ return 1;
-+}
-+
-+#ifdef CONFIG_COMPAT
-+struct compat_xt_mark_target_info_v1 {
-+ compat_ulong_t mark;
-+ u_int8_t mode;
-+ u_int8_t __pad1;
-+ u_int16_t __pad2;
-+};
-+
-+static void compat_from_user_v1(void *dst, void *src)
-+{
-+ struct compat_xt_mark_target_info_v1 *cm = src;
-+ struct xt_mark_target_info_v1 m = {
-+ .mark = cm->mark,
-+ .mode = cm->mode,
-+ };
-+ memcpy(dst, &m, sizeof(m));
-+}
-+
-+static int compat_to_user_v1(void __user *dst, void *src)
-+{
-+ struct xt_mark_target_info_v1 *m = src;
-+ struct compat_xt_mark_target_info_v1 cm = {
-+ .mark = m->mark,
-+ .mode = m->mode,
-+ };
-+ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
-+}
-+#endif /* CONFIG_COMPAT */
-+
-+static struct xt_target xt_mark_target[] = {
-+ {
-+ .name = "MARK",
-+ .family = AF_INET,
-+ .revision = 0,
-+ .checkentry = checkentry_v0,
-+ .target = target_v0,
-+ .targetsize = sizeof(struct xt_mark_target_info),
-+ .table = "mangle",
-+ .me = THIS_MODULE,
-+ },
-+ {
-+ .name = "MARK",
-+ .family = AF_INET,
-+ .revision = 1,
-+ .checkentry = checkentry_v1,
-+ .target = target_v1,
-+ .targetsize = sizeof(struct xt_mark_target_info_v1),
-+#ifdef CONFIG_COMPAT
-+ .compatsize = sizeof(struct compat_xt_mark_target_info_v1),
-+ .compat_from_user = compat_from_user_v1,
-+ .compat_to_user = compat_to_user_v1,
-+#endif
-+ .table = "mangle",
-+ .me = THIS_MODULE,
-+ },
-+ {
-+ .name = "MARK",
-+ .family = AF_INET6,
-+ .revision = 0,
-+ .checkentry = checkentry_v0,
-+ .target = target_v0,
-+ .targetsize = sizeof(struct xt_mark_target_info),
-+ .table = "mangle",
-+ .me = THIS_MODULE,
-+ },
-+};
-+
-+static int __init xt_mark_init(void)
-+{
-+ return xt_register_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target));
-+}
-+
-+static void __exit xt_mark_fini(void)
-+{
-+ xt_unregister_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target));
-+}
-+
-+module_init(xt_mark_init);
-+module_exit(xt_mark_fini);
diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
--- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-02-20 04:13:13.000000000 -0500
git://git.onelab.eu / linux-2.6.git / commitdiff