1 diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h
2 --- linux-2.6.22-510/include/linux/skbuff.h 2007-07-08 19:32:17.000000000 -0400
3 +++ linux-2.6.22-520/include/linux/skbuff.h 2008-06-06 17:07:56.000000000 -0400
10 sk_buff_data_t transport_header;
11 sk_buff_data_t network_header;
12 diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
13 --- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400
14 +++ linux-2.6.22-520/net/core/skbuff.c 2008-06-06 17:07:56.000000000 -0400
16 #include <linux/rtnetlink.h>
17 #include <linux/init.h>
18 #include <linux/scatterlist.h>
19 +#include <linux/vs_network.h>
21 #include <net/protocol.h>
25 skb_reset_tail_pointer(skb);
26 skb->end = skb->tail + size;
27 + if (!in_interrupt()) skb->skb_tag = nx_current_nid(); else skb->skb_tag = 0;
28 /* make sure we initialize shinfo sequentially */
29 shinfo = skb_shinfo(skb);
30 atomic_set(&shinfo->dataref, 1);
35 + /* Sapan: Cloned skbs aren't owned by anyone. Let the cloner decide who it belongs to. */
37 atomic_inc(&(skb_shinfo(skb)->dataref));
41 new->tc_index = old->tc_index;
43 skb_copy_secmark(new, old);
44 + new->skb_tag = old->skb_tag;
45 atomic_set(&new->users, 1);
46 skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
47 skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
48 diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
49 --- linux-2.6.22-510/net/ipv4/af_inet.c 2008-06-06 17:07:48.000000000 -0400
50 +++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-06-06 17:07:56.000000000 -0400
54 inet->sport = htons(inet->num);
55 + sk->sk_xid = vx_current_xid();
56 + if (!in_interrupt()) sk->sk_nid = nx_current_nid(); else sk->sk_nid=0;
60 diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
61 --- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-06-06 17:07:43.000000000 -0400
62 +++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-06-06 17:07:56.000000000 -0400
65 logflags = NF_LOG_MASK;
67 + printk("TAG=%d ", skb->skb_tag);
69 ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);