diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h
--- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-04-03 16:45:14.000000000 -0400
@@ -11,6 +11,7 @@
XT_MARK_SET=0,
XT_MARK_AND,
struct xt_mark_target_info_v1 {
diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h
--- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-04-03 16:45:14.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _XT_SETXID_H_target
+#define _XT_SETXID_H_target
+#endif /*_XT_SETXID_H_target*/
diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h
--- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-04-03 16:45:14.000000000 -0400
@@ -12,6 +12,7 @@
#define IPT_MARK_SET XT_MARK_SET
#define IPT_MARK_AND XT_MARK_AND
diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h
--- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-04-03 16:45:14.000000000 -0400
@@ -0,0 +1,13 @@
+#ifndef _IPT_SETXID_H_target
+#define _IPT_SETXID_H_target
+#endif /*_IPT_SETXID_H_target*/
diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h
--- linux-2.6.22-510/include/linux/skbuff.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/skbuff.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/linux/skbuff.h 2008-04-03 16:45:14.000000000 -0400
@@ -302,6 +302,7 @@
#endif
sk_buff_data_t network_header;
diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h
--- linux-2.6.22-510/include/linux/socket.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/socket.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/linux/socket.h 2008-04-03 16:45:14.000000000 -0400
@@ -288,6 +288,8 @@
#define SOL_TIPC 271
#define SOL_RXRPC 272
#define IPX_TYPE 1
diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h
---- linux-2.6.22-510/include/linux/vserver/network.h 2008-02-20 04:13:10.000000000 -0500
-+++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-20 04:13:12.000000000 -0500
-@@ -45,6 +45,8 @@
- /* network caps */
+--- linux-2.6.22-510/include/linux/vserver/network.h 2008-04-03 16:45:11.000000000 -0400
++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-04-03 16:45:14.000000000 -0400
+@@ -47,6 +47,8 @@
+ #define NXC_TUN_CREATE 0x00000001
#define NXC_RAW_ICMP 0x00000100
+#define NXC_RAW_SOCKET 0x00000200
/* 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
++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-04-03 16:45:14.000000000 -0400
@@ -131,6 +131,9 @@
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
};
diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
--- linux-2.6.22-510/include/net/raw.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/net/raw.h 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/include/net/raw.h 2008-04-03 16:45:14.000000000 -0400
@@ -36,7 +36,7 @@
extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
--- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/core/skbuff.c 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/net/core/skbuff.c 2008-04-03 16:45:14.000000000 -0400
@@ -56,6 +56,7 @@
#include <linux/rtnetlink.h>
#include <linux/init.h>
skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
---- linux-2.6.22-510/net/core/sock.c 2008-02-20 04:13:09.000000000 -0500
-+++ linux-2.6.22-520/net/core/sock.c 2008-02-20 04:13:12.000000000 -0500
+--- linux-2.6.22-510/net/core/sock.c 2008-04-03 16:45:11.000000000 -0400
++++ linux-2.6.22-520/net/core/sock.c 2008-04-03 16:45:14.000000000 -0400
@@ -444,6 +444,19 @@
}
goto set_sndbuf;
break;
}
diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
---- linux-2.6.22-510/net/ipv4/af_inet.c 2008-02-20 04:13:09.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-20 04:13:12.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/af_inet.c 2008-04-03 16:45:11.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-04-03 16:45:14.000000000 -0400
@@ -178,6 +178,8 @@
return -EAGAIN;
}
goto out_rcu_unlock;
override:
diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
---- linux-2.6.22-510/net/ipv4/icmp.c 2008-02-20 04:13:12.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-20 04:13:12.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/icmp.c 2008-04-03 16:45:14.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-04-03 16:45:14.000000000 -0400
@@ -709,7 +709,7 @@
if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
iph = (struct iphdr *)skb->data;
diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
--- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-04-03 16:45:14.000000000 -0400
@@ -409,7 +409,7 @@
optptr[2] += 8;
break;
goto error;
}
diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
---- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-02-20 04:13:05.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-20 04:13:12.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-04-03 16:45:06.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-04-03 16:45:14.000000000 -0400
@@ -49,6 +49,8 @@
else
logflags = NF_LOG_MASK;
if (ih == NULL) {
printk("TRUNCATED");
diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
---- linux-2.6.22-510/net/ipv4/raw.c 2008-02-20 04:13:09.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-20 04:13:12.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/raw.c 2008-04-03 16:45:11.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/raw.c 2008-04-03 16:45:14.000000000 -0400
@@ -103,7 +103,7 @@
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
goto error_free;
diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
--- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/Kconfig 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/Kconfig 2008-04-03 16:45:14.000000000 -0400
@@ -389,6 +389,13 @@
To compile it as a module, choose M here. If unsure, say N.
depends on NETFILTER_XTABLES
diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
--- linux-2.6.22-510/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/Makefile 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/Makefile 2008-04-03 16:45:14.000000000 -0400
@@ -37,6 +37,7 @@
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
--- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-02-20 04:13:12.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-04-03 16:45:14.000000000 -0400
@@ -726,6 +726,8 @@
/* Overload tuple linked list to put us in unconfirmed list. */
diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
--- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-02-20 06:56:29.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-04-04 17:27:41.000000000 -0400
@@ -5,13 +5,18 @@
* 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
switch (markinfo->mode) {
case XT_MARK_SET:
-@@ -58,8 +105,58 @@
+@@ -58,8 +105,64 @@
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 || proto == 17) {
-+ if (((*pskb)->mark!=-1) && (*pskb)->mark)
-+ ct->xid[0]=(*pskb)->mark;
-+ if (ct->xid[0])
-+ mark = ct->xid[0];
-+
-+ }
-+ 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;
-+ }
-+ }
++ 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 || proto == 17) {
++ if (((*pskb)->mark!=-1) && (*pskb)->mark)
++ ct->xid[0]=(*pskb)->mark;
++ if (ct->xid[0])
++ mark = ct->xid[0];
++
++ }
++ else if (proto == 6) {
++ if ((*pskb)->sk) {
++ connection_sk = (*pskb)->sk;
++ sock_hold(connection_sk);
++ }
++ else
++ connection_sk = inet_lookup_established(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
++
++
++ if (connection_sk) {
++ if (connection_sk->sk_state == TCP_TIME_WAIT) {
++ inet_twsk_put(inet_twsk(connection_sk));
++ break;
++ }
++ 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;
++ else
++ sock_put(connection_sk);
++ }
++ }
++ break;
++ }
}
+ if (mark != -1)
(*pskb)->mark = mark;
return XT_CONTINUE;
}
-@@ -92,7 +189,8 @@
+@@ -92,7 +195,8 @@
if (markinfo->mode != XT_MARK_SET
&& markinfo->mode != XT_MARK_AND
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 @@
+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-04-03 16:45:14.000000000 -0400
+@@ -0,0 +1,79 @@
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/ip.h>
++#include <net/checksum.h>
++#include <linux/vs_network.h>
++
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_SETXID.h>
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("");
++MODULE_DESCRIPTION("");
++MODULE_ALIAS("ipt_SETXID");
++
++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_setxid_target_info_v1 *setxidinfo = targinfo;
++
++ switch (setxidinfo->mode) {
++ case XT_SET_PACKET_XID:
++ (*pskb)->skb_tag = setxidinfo->mark;
++ break;
++ }
++ return XT_CONTINUE;
++}
++
++
++static int
++checkentry_v1(const char *tablename,
++ const void *entry,
++ const struct xt_target *target,
++ void *targinfo,
++ unsigned int hook_mask)
++{
++ struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
++
++ if (setxidinfo->mode != XT_SET_PACKET_XID) {
++ printk(KERN_WARNING "SETXID: unknown mode %u\n",
++ setxidinfo->mode);
++ return 0;
++ }
++
++ return 1;
++}
++
++static struct xt_target xt_setxid_target[] = {
++ {
++ .name = "SETXID",
++ .family = AF_INET,
++ .revision = 1,
++ .checkentry = checkentry_v1,
++ .target = target_v1,
++ .targetsize = sizeof(struct xt_setxid_target_info_v1),
++ .table = "mangle",
++ .me = THIS_MODULE,
++ }
++};
++
++static int __init init(void)
++{
++ int err;
++
++ err = xt_register_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
++ return err;
++}
++
++static void __exit fini(void)
++{
++ xt_unregister_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
++}
++
++module_init(init);
++module_exit(fini);
+diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
+--- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400
++++ linux-2.6.22-520/net/packet/af_packet.c 2008-04-03 16:45:14.000000000 -0400
+@@ -78,6 +78,7 @@
+ #include <linux/poll.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/vs_network.h>
+
+ #ifdef CONFIG_INET
+ #include <net/inet_common.h>
+@@ -324,6 +325,9 @@
+ __be16 proto=0;
+ int err;
+
++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
++ return -EPERM;
++
+ /*
+ * Get and verify the address.
+ */
+@@ -420,6 +424,10 @@
+ unsigned int res)
+ {
+ struct sk_filter *filter;
++ int tag = skb->skb_tag;
++
++ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
++ return 0;
+
+ rcu_read_lock_bh();
+ filter = rcu_dereference(sk->sk_filter);
+@@ -711,6 +719,9 @@
+ unsigned char *addr;
+ int ifindex, err, reserve = 0;
+
++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
++ return -EPERM;
++
+ /*
+ * Get and verify the address.
+ */
+@@ -984,7 +995,7 @@
+ __be16 proto = (__force __be16)protocol; /* weird, but documented */
+ int err;
+
+- if (!capable(CAP_NET_RAW))
++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET))
+ return -EPERM;
+ if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
+ sock->type != SOCK_PACKET)
+diff -Nurb linux-2.6.22-510/xt_MARK.c linux-2.6.22-520/xt_MARK.c
+--- linux-2.6.22-510/xt_MARK.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.22-520/xt_MARK.c 2008-04-04 14:26:30.000000000 -0400
+@@ -0,0 +1,287 @@
+/* This is a module which is used for setting the NFMARK field of an skb. */
+
+/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ 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)
++ case XT_MARK_SET:
++ mark = markinfo->mark;
+ 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);
++ case XT_MARK_AND:
++ mark = (*pskb)->mark & markinfo->mark;
++ break;
+
-+ 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);
++ case XT_MARK_OR:
++ mark = (*pskb)->mark | markinfo->mark;
++ break;
+
-+ }
-+ 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;
-+ }
-+ }
++ 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 || proto == 17) {
++ if (((*pskb)->mark!=-1) && (*pskb)->mark)
++ ct->xid[0]=(*pskb)->mark;
++ if (ct->xid[0])
++ mark = ct->xid[0];
++
++ }
++ else if (proto == 6) {
++ if ((*pskb)->sk) {
++ connection_sk = (*pskb)->sk;
++ sock_hold(connection_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->sk_state == TCP_TIME_WAIT)
++ inet_twsk_put(inet_twsk(connection_sk));
++ else
++ sock_put(connection_sk);
++ }
++ }
++ break;
++ }
+ }
+
+ if (mark != -1)
+
+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
-@@ -0,0 +1,79 @@
-+#include <linux/module.h>
-+#include <linux/skbuff.h>
-+#include <linux/ip.h>
-+#include <net/checksum.h>
-+#include <linux/vs_network.h>
-+
-+#include <linux/netfilter/x_tables.h>
-+#include <linux/netfilter/xt_SETXID.h>
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("");
-+MODULE_DESCRIPTION("");
-+MODULE_ALIAS("ipt_SETXID");
-+
-+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_setxid_target_info_v1 *setxidinfo = targinfo;
-+
-+ switch (setxidinfo->mode) {
-+ case XT_SET_PACKET_XID:
-+ (*pskb)->skb_tag = setxidinfo->mark;
-+ break;
-+ }
-+ return XT_CONTINUE;
-+}
-+
-+
-+static int
-+checkentry_v1(const char *tablename,
-+ const void *entry,
-+ const struct xt_target *target,
-+ void *targinfo,
-+ unsigned int hook_mask)
-+{
-+ struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
-+
-+ if (setxidinfo->mode != XT_SET_PACKET_XID) {
-+ printk(KERN_WARNING "SETXID: unknown mode %u\n",
-+ setxidinfo->mode);
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+static struct xt_target xt_setxid_target[] = {
-+ {
-+ .name = "SETXID",
-+ .family = AF_INET,
-+ .revision = 1,
-+ .checkentry = checkentry_v1,
-+ .target = target_v1,
-+ .targetsize = sizeof(struct xt_setxid_target_info_v1),
-+ .table = "mangle",
-+ .me = THIS_MODULE,
-+ }
-+};
-+
-+static int __init init(void)
-+{
-+ int err;
-+
-+ err = xt_register_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
-+ return err;
-+}
-+
-+static void __exit fini(void)
-+{
-+ xt_unregister_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
-+}
-+
-+module_init(init);
-+module_exit(fini);
-diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
---- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/packet/af_packet.c 2008-02-20 04:13:13.000000000 -0500
-@@ -78,6 +78,7 @@
- #include <linux/poll.h>
- #include <linux/module.h>
- #include <linux/init.h>
-+#include <linux/vs_network.h>
-
- #ifdef CONFIG_INET
- #include <net/inet_common.h>
-@@ -324,6 +325,9 @@
- __be16 proto=0;
- int err;
-
-+ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
-+ return -EPERM;
-+
- /*
- * Get and verify the address.
- */
-@@ -420,6 +424,10 @@
- unsigned int res)
- {
- struct sk_filter *filter;
-+ int tag = skb->skb_tag;
-+
-+ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
-+ return 0;
-
- rcu_read_lock_bh();
- filter = rcu_dereference(sk->sk_filter);
-@@ -711,6 +719,9 @@
- unsigned char *addr;
- int ifindex, err, reserve = 0;
-
-+ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
-+ return -EPERM;
-+
- /*
- * Get and verify the address.
- */
-@@ -984,7 +995,7 @@
- __be16 proto = (__force __be16)protocol; /* weird, but documented */
- int err;
-
-- if (!capable(CAP_NET_RAW))
-+ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET))
- return -EPERM;
- if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
- sock->type != SOCK_PACKET)