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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/linux/skbuff.h 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/linux/socket.h 2008-06-06 17:07:56.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-18 20:35:58.000000000 -0500
-+++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-18 20:36:01.000000000 -0500
-@@ -45,6 +45,8 @@
- /* network caps */
+--- linux-2.6.22-510/include/linux/vserver/network.h 2008-06-06 17:07:48.000000000 -0400
++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-06-06 17:07:56.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-18 20:36:01.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-06-06 17:07:56.000000000 -0400
@@ -131,6 +131,9 @@
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
+ /* PLANETLAB. VNET-specific */
-+ xid_t xid[IP_CT_DIR_MAX];
++ int xid[IP_CT_DIR_MAX];
+
/* features dynamically at the end: helper, nat (both optional) */
char data[0];
};
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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/include/net/raw.h 2008-06-06 17:07:56.000000000 -0400
@@ -36,7 +36,7 @@
extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
+diff -Nurb linux-2.6.22-510/net/core/dev.c linux-2.6.22-520/net/core/dev.c
+--- linux-2.6.22-510/net/core/dev.c 2008-06-06 17:07:48.000000000 -0400
++++ linux-2.6.22-520/net/core/dev.c 2008-06-06 17:07:56.000000000 -0400
+@@ -1803,6 +1803,7 @@
+ * the ingress scheduler, you just cant add policies on ingress.
+ *
+ */
++
+ static int ing_filter(struct sk_buff *skb)
+ {
+ struct Qdisc *q;
+@@ -1832,13 +1833,20 @@
+ }
+ #endif
+
++/* The code already makes the assumption that packet handlers run
++ * sequentially on the same CPU. -Sapan */
++DEFINE_PER_CPU(int, sknid_elevator);
++
+ int netif_receive_skb(struct sk_buff *skb)
+ {
+ struct packet_type *ptype, *pt_prev;
+ struct net_device *orig_dev;
+ int ret = NET_RX_DROP;
++ int *cur_elevator=&__get_cpu_var(sknid_elevator);
+ __be16 type;
+
++ *cur_elevator = 0;
++
+ /* if we've gotten here through NAPI, check netpoll */
+ if (skb->dev->poll && netpoll_rx(skb))
+ return NET_RX_DROP;
+@@ -1873,8 +1881,9 @@
+
+ list_for_each_entry_rcu(ptype, &ptype_all, list) {
+ if (!ptype->dev || ptype->dev == skb->dev) {
+- if (pt_prev)
++ if (pt_prev) {
+ ret = deliver_skb(skb, pt_prev, orig_dev);
++ }
+ pt_prev = ptype;
+ }
+ }
+@@ -1912,8 +1921,22 @@
+ }
+ }
+
++ /* We don't want the packet handlers to throw the packet away
++ * if we want the taps to treat it again - Sapan */
++ if (*cur_elevator) {
++ atomic_inc(&skb->users);
++ }
++
+ if (pt_prev) {
+ ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
++ if (*cur_elevator > 0) {
++ skb->skb_tag = *cur_elevator;
++ list_for_each_entry_rcu(ptype, &ptype_all, list) {
++ if (!ptype->dev || ptype->dev == skb->dev) {
++ ret = deliver_skb(skb, ptype, orig_dev);
++ }
++ }
++ }
+ } else {
+ kfree_skb(skb);
+ /* Jamal, now you will not able to escape explaining
+@@ -1922,6 +1945,13 @@
+ ret = NET_RX_DROP;
+ }
+
++ if (*cur_elevator) {
++ /* We have a packet */
++ kfree_skb(skb);
++ }
++
++ *cur_elevator=0;
++
+ out:
+ rcu_read_unlock();
+ return ret;
+@@ -3780,6 +3810,7 @@
+ EXPORT_SYMBOL(net_enable_timestamp);
+ EXPORT_SYMBOL(net_disable_timestamp);
+ EXPORT_SYMBOL(dev_get_flags);
++EXPORT_PER_CPU_SYMBOL(sknid_elevator);
+
+ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+ EXPORT_SYMBOL(br_handle_frame_hook);
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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/core/skbuff.c 2008-06-06 17:07:56.000000000 -0400
@@ -56,6 +56,7 @@
#include <linux/rtnetlink.h>
#include <linux/init.h>
skb->data = data;
skb_reset_tail_pointer(skb);
skb->end = skb->tail + size;
-+ skb->skb_tag = nx_current_nid();
++ if (!in_interrupt()) skb->skb_tag = nx_current_nid(); else skb->skb_tag = 0;
/* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb);
atomic_set(&shinfo->dataref, 1);
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-18 20:35:56.000000000 -0500
-+++ linux-2.6.22-520/net/core/sock.c 2008-02-18 20:36:01.000000000 -0500
+--- linux-2.6.22-510/net/core/sock.c 2008-06-06 17:07:48.000000000 -0400
++++ linux-2.6.22-520/net/core/sock.c 2008-06-06 17:07:56.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-18 20:35:56.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-18 20:36:01.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/af_inet.c 2008-06-06 17:07:48.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-06-06 17:07:56.000000000 -0400
@@ -178,6 +178,8 @@
return -EAGAIN;
}
inet->sport = htons(inet->num);
+ sk->sk_xid = vx_current_xid();
-+ sk->sk_nid = nx_current_nid();
++ if (!in_interrupt()) sk->sk_nid = nx_current_nid(); else sk->sk_nid=0;
}
release_sock(sk);
return 0;
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-18 20:36:01.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-18 20:36:01.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/icmp.c 2008-06-06 17:07:55.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-06-06 17:07:56.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-18 20:35:53.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-18 20:36:01.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-06-06 17:07:43.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-06-06 17:07:56.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-18 20:35:56.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-18 20:36:01.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/raw.c 2008-06-06 17:07:48.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/raw.c 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/Kconfig 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/Makefile 2008-06-06 17:07:56.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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-06-06 17:07:56.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-18 20:37:36.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-06-07 17:55:26.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
static unsigned int
target_v0(struct sk_buff **pskb,
const struct net_device *in,
-@@ -44,7 +91,7 @@
+@@ -35,6 +82,8 @@
+ return XT_CONTINUE;
+ }
+
++extern DEFINE_PER_CPU(int, sknid_elevator);
++
+ static unsigned int
+ target_v1(struct sk_buff **pskb,
+ const struct net_device *in,
+@@ -44,7 +93,20 @@
const void *targinfo)
{
const struct xt_mark_target_info_v1 *markinfo = targinfo;
- int mark = 0;
++ enum ip_conntrack_info ctinfo;
++ struct sock *connection_sk;
++ int dif;
++ struct nf_conn *ct;
++ extern struct inet_hashinfo tcp_hashinfo;
++ enum ip_conntrack_dir dir;
++ int *curtag;
++ u_int32_t src_ip;
++ u_int32_t dst_ip;
++ u_int16_t proto, src_port;
++ u_int32_t ip;
++ u_int16_t port;
++
+ int mark = -1;
switch (markinfo->mode) {
case XT_MARK_SET:
-@@ -58,8 +105,48 @@
+@@ -58,13 +120,74 @@
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_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 ((*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:
++
++ ct = nf_ct_get((*pskb), &ctinfo);
++ if (!ct)
++ break;
++
++ dir = CTINFO2DIR(ctinfo);
++ src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
++ dst_ip = ct->tuplehash[dir].tuple.dst.u3.ip;
++ src_port = get_src_port(&ct->tuplehash[dir].tuple);
++ proto = ct->tuplehash[dir].tuple.dst.protonum;
++
++ 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>0) /* The packet is marked, it's going out */
++ {
++ //if (ct->xid[0]>0 && ct->xid[0]!=(*pskb)->mark)
++ /*printk(KERN_CRIT "xt_MARK log: %d/%d/%d/%d\n",ct->xid[0],(*pskb)->mark,hooknum==NF_IP_LOCAL_IN,proto);*/
++
++ ct->xid[0]=(*pskb)->mark;
}
-+ if (mark != -1)
++ if (ct->xid[0] > 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_nid;
++ if (connection_sk->sk_nid != 0)
++ mark = connection_sk->sk_nid;
++ sock_put(connection_sk);
++ }
++ else
++ mark = -1 ;
++ }
++ break;
++ }
++ if (mark != -1) {
(*pskb)->mark = mark;
++ }
++
++ curtag=&__get_cpu_var(sknid_elevator);
++ if (mark > 0 && *curtag==-2)
++ {
++ *curtag = mark;
++ }
return XT_CONTINUE;
}
-@@ -92,7 +179,8 @@
+
+-
+ static int
+ checkentry_v0(const char *tablename,
+ const void *entry,
+@@ -92,7 +215,8 @@
if (markinfo->mode != XT_MARK_SET
&& markinfo->mode != XT_MARK_AND
return 0;
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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-06-06 17:07:56.000000000 -0400
@@ -0,0 +1,79 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+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-18 20:36:01.000000000 -0500
++++ linux-2.6.22-520/net/packet/af_packet.c 2008-06-07 18:30:41.000000000 -0400
@@ -78,6 +78,7 @@
#include <linux/poll.h>
#include <linux/module.h>
#ifdef CONFIG_INET
#include <net/inet_common.h>
-@@ -324,6 +325,9 @@
+@@ -246,10 +247,13 @@
+
+ static const struct proto_ops packet_ops_spkt;
+
++extern DEFINE_PER_CPU(int, sknid_elevator);
+ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
+ {
+ struct sock *sk;
+ struct sockaddr_pkt *spkt;
++ int tag = skb->skb_tag;
++ int *elevator=&__get_cpu_var(sknid_elevator);
+
+ /*
+ * When we registered the protocol we saved the socket in the data
+@@ -269,6 +273,22 @@
+ * so that this procedure is noop.
+ */
+
++ /*
++ * (18:05:41) daniel_hozac: where?
++ * (18:05:58) daniel_hozac: we already have filters on PF_PACKET, don't we?
++ * (18:05:58) er: in packet_rcv_skpt
++ * (18:07:33) daniel_hozac: oh, that's evil.
++ */
++
++ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag)) {
++ *elevator=-2;
++ goto out;
++ }
++ else if (!sk->sk_nx_info && *elevator) {
++ /* Root has already seen this packet */
++ goto out;
++ }
++
+ if (skb->pkt_type == PACKET_LOOPBACK)
+ goto out;
+
+@@ -324,6 +344,9 @@
__be16 proto=0;
int err;
/*
* Get and verify the address.
*/
-@@ -420,6 +424,10 @@
+@@ -420,6 +443,17 @@
unsigned int res)
{
struct sk_filter *filter;
+ int tag = skb->skb_tag;
++ int *elevator=&__get_cpu_var(sknid_elevator);
+
-+ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
++ if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag)) {
++ *elevator=-2;
++ return 0;
++ }
++ else if (!sk->sk_nx_info && *elevator) {
++ /* Root has already seen this packet */
+ return 0;
++ }
rcu_read_lock_bh();
filter = rcu_dereference(sk->sk_filter);
-@@ -711,6 +719,9 @@
+@@ -711,6 +745,9 @@
unsigned char *addr;
int ifindex, err, reserve = 0;
-+ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
+ return -EPERM;
+
/*
* Get and verify the address.
*/
-@@ -984,7 +995,7 @@
+@@ -984,8 +1021,9 @@
__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)
+ return -ESOCKTNOSUPPORT;
git://git.onelab.eu / linux-2.6.git / blobdiff