-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter/xt_MARK.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter/xt_MARK.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter/xt_MARK.h 2006-06-17 21:49:35.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter/xt_MARK.h 2007-11-14 16:04:04.000000000 -0500
+diff -Nurp 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 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-02-15 20:36:43.000000000 +0100
@@ -11,6 +11,7 @@ enum {
XT_MARK_SET=0,
XT_MARK_AND,
};
struct xt_mark_target_info_v1 {
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter/xt_SETXID.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter/xt_SETXID.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter/xt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter/xt_SETXID.h 2007-11-14 16:05:44.000000000 -0500
+diff -Nurp 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 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-02-15 20:36:43.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef _XT_SETXID_H_target
+#define _XT_SETXID_H_target
+};
+
+#endif /*_XT_SETXID_H_target*/
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter_ipv4/ipt_MARK.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter_ipv4/ipt_MARK.h 2006-06-17 21:49:35.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter_ipv4/ipt_MARK.h 2007-11-14 16:03:44.000000000 -0500
-@@ -9,9 +9,10 @@
- #define ipt_mark_target_info xt_mark_target_info
-
- /* Version 1 */
--#define IPT_MARK_SET XT_MARK_SET
--#define IPT_MARK_AND XT_MARK_AND
--#define IPT_MARK_OR XT_MARK_OR
-+#define IPT_MARK_SET XT_MARK_SET
-+#define IPT_MARK_AND XT_MARK_AND
-+#define IPT_MARK_OR XT_MARK_OR
+diff -Nurp 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 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-02-15 20:36:43.000000000 +0100
+@@ -12,6 +12,7 @@
+ #define IPT_MARK_SET XT_MARK_SET
+ #define IPT_MARK_AND XT_MARK_AND
+ #define IPT_MARK_OR XT_MARK_OR
+#define IPT_MARK_COPYXID XT_MARK_COPYXID
#define ipt_mark_target_info_v1 xt_mark_target_info_v1
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter_ipv4/ipt_SETXID.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/netfilter_ipv4/ipt_SETXID.h 2007-11-14 16:05:44.000000000 -0500
+diff -Nurp 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 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-02-15 20:36:43.000000000 +0100
@@ -0,0 +1,13 @@
+#ifndef _IPT_SETXID_H_target
+#define _IPT_SETXID_H_target
+#define ipt_setxid_target_info_v1 xt_setxid_target_info_v1
+
+#endif /*_IPT_SETXID_H_target*/
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/skbuff.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/skbuff.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/skbuff.h 2007-07-21 18:00:24.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/skbuff.h 2007-11-15 13:57:04.000000000 -0500
-@@ -299,6 +299,9 @@ struct sk_buff {
- #endif
- #ifdef CONFIG_NETWORK_SECMARK
- __u32 secmark;
-+# define skb_tag secmark
-+#else
-+# define skb_tag mark
+diff -Nurp 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-22 00:00:24.000000000 +0200
++++ linux-2.6.22-520/include/linux/skbuff.h 2008-02-15 20:36:43.000000000 +0100
+@@ -302,6 +302,7 @@ struct sk_buff {
#endif
__u32 mark;
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/socket.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/socket.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/socket.h 2007-07-21 18:00:24.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/socket.h 2007-11-14 14:24:36.000000000 -0500
++#define skb_tag mark
+
+ sk_buff_data_t transport_header;
+ sk_buff_data_t network_header;
+diff -Nurp 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-22 00:00:24.000000000 +0200
++++ linux-2.6.22-520/include/linux/socket.h 2008-02-15 20:36:43.000000000 +0100
@@ -288,6 +288,8 @@ struct ucred {
#define SOL_TIPC 271
#define SOL_RXRPC 272
/* IPX options */
#define IPX_TYPE 1
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/vserver/network.h linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/vserver/network.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/linux/vserver/network.h 2007-10-29 21:23:59.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/linux/vserver/network.h 2007-11-14 14:23:54.000000000 -0500
-@@ -44,6 +44,8 @@ static inline uint64_t __nxf_init_set(vo
+diff -Nurp 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-15 20:36:27.000000000 +0100
++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-15 20:36:43.000000000 +0100
+@@ -45,6 +45,8 @@ static inline uint64_t __nxf_init_set(vo
/* network caps */
#define NXC_RAW_ICMP 0x00000100
/* address types */
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/net/netfilter/nf_conntrack.h linux-2.6.22.10-vs2.3.0.29-pl04/include/net/netfilter/nf_conntrack.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/net/netfilter/nf_conntrack.h 2007-07-21 18:00:24.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/net/netfilter/nf_conntrack.h 2007-11-14 16:35:42.000000000 -0500
+diff -Nurp 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 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/include/linux/vserver/network.h.orig 2008-02-15 20:36:27.000000000 +0100
+@@ -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 -Nurp 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-22 00:00:24.000000000 +0200
++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-02-15 20:36:43.000000000 +0100
@@ -131,6 +131,9 @@ struct nf_conn
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
/* features dynamically at the end: helper, nat (both optional) */
char data[0];
};
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/include/net/raw.h linux-2.6.22.10-vs2.3.0.29-pl04/include/net/raw.h
---- linux-2.6.22.10-vs2.3.0.29-pl03/include/net/raw.h 2007-05-04 09:55:46.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/include/net/raw.h 2007-11-14 14:22:49.000000000 -0500
+diff -Nurp 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-05-04 15:55:46.000000000 +0200
++++ linux-2.6.22-520/include/net/raw.h 2008-02-15 20:36:43.000000000 +0100
@@ -36,7 +36,7 @@ extern rwlock_t raw_v4_lock;
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 -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/core/skbuff.c linux-2.6.22.10-vs2.3.0.29-pl04/net/core/skbuff.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/core/skbuff.c 2007-07-21 18:00:25.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/core/skbuff.c 2007-11-14 15:12:52.000000000 -0500
+diff -Nurp 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-22 00:00:25.000000000 +0200
++++ linux-2.6.22-520/net/core/skbuff.c 2008-02-15 20:36:44.000000000 +0100
@@ -56,6 +56,7 @@
#include <linux/rtnetlink.h>
#include <linux/init.h>
atomic_set(&new->users, 1);
skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/core/sock.c linux-2.6.22.10-vs2.3.0.29-pl04/net/core/sock.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/core/sock.c 2007-10-29 21:23:59.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/core/sock.c 2007-11-14 14:36:36.000000000 -0500
+diff -Nurp 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-15 20:36:20.000000000 +0100
++++ linux-2.6.22-520/net/core/sock.c 2008-02-15 20:36:44.000000000 +0100
@@ -444,6 +444,19 @@ set_sndbuf:
}
goto set_sndbuf;
ret = -EPERM;
break;
}
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/af_inet.c linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/af_inet.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/af_inet.c 2007-10-29 21:23:59.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/af_inet.c 2007-11-14 16:40:54.000000000 -0500
+diff -Nurp 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-15 20:36:20.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-15 21:33:42.000000000 +0100
@@ -178,6 +178,8 @@ static int inet_autobind(struct sock *sk
return -EAGAIN;
}
}
release_sock(sk);
return 0;
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/icmp.c linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/icmp.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/icmp.c 2007-11-14 14:00:56.000000000 -0500
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/icmp.c 2007-11-15 13:57:04.000000000 -0500
+@@ -312,6 +314,9 @@ lookup_protocol:
+ if ((protocol == IPPROTO_ICMP) &&
+ nx_capable(answer->capability, NXC_RAW_ICMP))
+ goto override;
++ if (sock->type == SOCK_RAW &&
++ nx_capable(answer->capability, NXC_RAW_SOCKET))
++ goto override;
+ if (answer->capability > 0 && !capable(answer->capability))
+ goto out_rcu_unlock;
+ override:
+diff -Nurp 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-15 20:36:42.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-15 20:36:44.000000000 +0100
@@ -709,7 +709,7 @@ static void icmp_unreach(struct sk_buff
if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
raw_err(raw_sk, skb, info);
raw_sk = sk_next(raw_sk);
iph = (struct iphdr *)skb->data;
-@@ -937,8 +937,8 @@ char sysctl_icmp_ipod_key[32+1] = { "SET
-
- static void icmp_ping_of_death(struct sk_buff *skb)
- {
-- struct icmphdr *icmph = skb->h.icmph;
-- struct iphdr *iph = skb->nh.iph;
-+ struct icmphdr *icmph = skb_transport_header(skb);
-+ struct iphdr *iph = skb_network_header(skb);
- int doit = 0;
-
- #if 0
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/ip_options.c linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/ip_options.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/ip_options.c 2007-07-21 18:00:25.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/ip_options.c 2007-11-14 17:03:19.000000000 -0500
+diff -Nurp 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-22 00:00:25.000000000 +0200
++++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-02-15 20:36:44.000000000 +0100
@@ -409,7 +409,7 @@ int ip_options_compile(struct ip_options
optptr[2] += 8;
break;
pp_ptr = optptr;
goto error;
}
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/netfilter/ipt_LOG.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/netfilter/ipt_LOG.c 2007-08-11 21:54:37.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/netfilter/ipt_LOG.c 2007-11-14 16:00:55.000000000 -0500
+diff -Nurp 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-15 20:35:53.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-15 20:36:44.000000000 +0100
@@ -49,6 +49,8 @@ static void dump_packet(const struct nf_
else
logflags = NF_LOG_MASK;
ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);
if (ih == NULL) {
printk("TRUNCATED");
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/raw.c linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/raw.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/ipv4/raw.c 2007-10-29 21:23:59.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/ipv4/raw.c 2007-11-14 17:02:08.000000000 -0500
+diff -Nurp 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-15 20:36:20.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-15 20:36:44.000000000 +0100
@@ -103,7 +103,7 @@ static void raw_v4_unhash(struct sock *s
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
sk->sk_nx_info &&
!v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
goto error_free;
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/Kconfig linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/Kconfig
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/Kconfig 2007-07-21 18:00:27.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/Kconfig 2007-11-14 15:27:12.000000000 -0500
+diff -Nurp 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-22 00:00:27.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/Kconfig 2008-02-15 20:36:44.000000000 +0100
@@ -389,6 +389,13 @@ config NETFILTER_XT_TARGET_TCPMSS
To compile it as a module, choose M here. If unsure, say N.
config NETFILTER_XT_MATCH_COMMENT
tristate '"comment" match support'
depends on NETFILTER_XTABLES
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/Makefile linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/Makefile
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/Makefile 2007-07-21 17:58:59.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/Makefile 2007-11-14 15:25:53.000000000 -0500
+diff -Nurp 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-21 23:58:59.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/Makefile 2008-02-15 20:36:44.000000000 +0100
@@ -37,6 +37,7 @@ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_co
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/nf_conntrack_core.c linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/nf_conntrack_core.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/nf_conntrack_core.c 2007-07-21 18:00:27.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/nf_conntrack_core.c 2007-11-14 16:39:09.000000000 -0500
+diff -Nurp 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-22 00:00:27.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-02-15 20:36:44.000000000 +0100
@@ -726,6 +726,8 @@ init_conntrack(const struct nf_conntrack
/* Overload tuple linked list to put us in unconfirmed list. */
write_unlock_bh(&nf_conntrack_lock);
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/xt_MARK.c linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/xt_MARK.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/xt_MARK.c 2007-07-21 17:59:00.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/xt_MARK.c 2007-11-15 13:57:04.000000000 -0500
+diff -Nurp 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-21 23:59:00.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-02-15 20:36:44.000000000 +0100
@@ -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,9 +105,52 @@ target_v1(struct sk_buff **pskb,
+@@ -58,8 +105,49 @@ target_v1(struct sk_buff **pskb,
case XT_MARK_OR:
mark = (*pskb)->mark | markinfo->mark;
break;
+ }
+
+ if (connection_sk) {
-+#ifdef REQUIRESFIXFROMSAPAN
+ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
+ ct->xid[!dir]=connection_sk->sk_xid;
-+ /*connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;*/
++ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;
+ if (connection_sk->sk_xid != 0)
+ mark = connection_sk->sk_xid;
-+#endif
+ if (connection_sk != (*pskb)->sk)
+ sock_put(connection_sk);
+ }
+ }
}
-- (*pskb)->mark = mark;
+ if (mark != -1)
-+ (*pskb)->mark = mark;
+ (*pskb)->mark = mark;
return XT_CONTINUE;
}
-
-@@ -92,7 +182,8 @@ checkentry_v1(const char *tablename,
+@@ -92,7 +180,8 @@ checkentry_v1(const char *tablename,
if (markinfo->mode != XT_MARK_SET
&& markinfo->mode != XT_MARK_AND
printk(KERN_WARNING "MARK: unknown mode %u\n",
markinfo->mode);
return 0;
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/xt_SETXID.c linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/xt_SETXID.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/netfilter/xt_SETXID.c 2007-11-14 16:20:02.000000000 -0500
+diff -Nurp 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 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-02-15 20:36:44.000000000 +0100
@@ -0,0 +1,79 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+
+module_init(init);
+module_exit(fini);
-diff -Nurp linux-2.6.22.10-vs2.3.0.29-pl03/net/packet/af_packet.c linux-2.6.22.10-vs2.3.0.29-pl04/net/packet/af_packet.c
---- linux-2.6.22.10-vs2.3.0.29-pl03/net/packet/af_packet.c 2007-07-21 18:00:27.000000000 -0400
-+++ linux-2.6.22.10-vs2.3.0.29-pl04/net/packet/af_packet.c 2007-11-15 13:57:04.000000000 -0500
+diff -Nurp 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-22 00:00:27.000000000 +0200
++++ linux-2.6.22-520/net/packet/af_packet.c 2008-02-15 20:36:45.000000000 +0100
@@ -78,6 +78,7 @@
#include <linux/poll.h>
#include <linux/module.h>
git://git.onelab.eu / linux-2.6.git / blobdiff