diff -Nurb linux-2.6.22-521/include/linux/netfilter/xt_MARK.h linux-2.6.22-522/include/linux/netfilter/xt_MARK.h
--- linux-2.6.22-521/include/linux/netfilter/xt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/include/linux/netfilter/xt_MARK.h 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/include/linux/netfilter/xt_MARK.h 2008-07-28 16:36:24.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-521/include/linux/netfilter/xt_SETXID.h linux-2.6.22-522/include/linux/netfilter/xt_SETXID.h
--- linux-2.6.22-521/include/linux/netfilter/xt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-522/include/linux/netfilter/xt_SETXID.h 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/include/linux/netfilter/xt_SETXID.h 2008-07-28 16:36:24.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-521/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-522/include/linux/netfilter_ipv4/ipt_MARK.h
--- linux-2.6.22-521/include/linux/netfilter_ipv4/ipt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/include/linux/netfilter_ipv4/ipt_MARK.h 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/include/linux/netfilter_ipv4/ipt_MARK.h 2008-07-28 16:36:24.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-521/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-522/include/linux/netfilter_ipv4/ipt_SETXID.h
--- linux-2.6.22-521/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-522/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-07-28 16:36:24.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-521/include/net/netfilter/nf_conntrack.h linux-2.6.22-522/include/net/netfilter/nf_conntrack.h
--- linux-2.6.22-521/include/net/netfilter/nf_conntrack.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/include/net/netfilter/nf_conntrack.h 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/include/net/netfilter/nf_conntrack.h 2008-07-28 16:36:24.000000000 -0400
@@ -131,6 +131,9 @@
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
};
diff -Nurb linux-2.6.22-521/net/netfilter/Kconfig linux-2.6.22-522/net/netfilter/Kconfig
--- linux-2.6.22-521/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/net/netfilter/Kconfig 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/net/netfilter/Kconfig 2008-07-28 16:36:24.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-521/net/netfilter/Makefile linux-2.6.22-522/net/netfilter/Makefile
--- linux-2.6.22-521/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/net/netfilter/Makefile 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/net/netfilter/Makefile 2008-07-28 16:36:24.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-521/net/netfilter/nf_conntrack_core.c linux-2.6.22-522/net/netfilter/nf_conntrack_core.c
--- linux-2.6.22-521/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/net/netfilter/nf_conntrack_core.c 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/net/netfilter/nf_conntrack_core.c 2008-07-28 16:36:24.000000000 -0400
@@ -726,6 +726,8 @@
/* Overload tuple linked list to put us in unconfirmed list. */
diff -Nurb linux-2.6.22-521/net/netfilter/xt_MARK.c linux-2.6.22-522/net/netfilter/xt_MARK.c
--- linux-2.6.22-521/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-522/net/netfilter/xt_MARK.c 2008-07-27 21:56:42.000000000 -0400
++++ linux-2.6.22-522/net/netfilter/xt_MARK.c 2008-07-31 14:49:48.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,
-@@ -35,6 +82,8 @@
+@@ -35,6 +82,10 @@
return XT_CONTINUE;
}
+extern DEFINE_PER_CPU(int, sknid_elevator);
++
++#define related(ct) (ct==(IP_CT_IS_REPLY + IP_CT_RELATED))
+
static unsigned int
target_v1(struct sk_buff **pskb,
const struct net_device *in,
-@@ -44,7 +93,20 @@
+@@ -44,7 +95,20 @@
const void *targinfo)
{
const struct xt_mark_target_info_v1 *markinfo = targinfo;
switch (markinfo->mode) {
case XT_MARK_SET:
-@@ -58,13 +120,75 @@
+@@ -58,13 +122,102 @@
case XT_MARK_OR:
mark = (*pskb)->mark | markinfo->mark;
break;
+ dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
+
+ ct = nf_ct_get((*pskb), &ctinfo);
-+ if (!ct) {
++ if (!ct)
+ break;
- }
-
+
+ dir = CTINFO2DIR(ctinfo);
+ src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
+ }
+ else if (proto == 6) {
+ if ((*pskb)->sk) {
++ /* It's a listening socket */
+ connection_sk = (*pskb)->sk;
+ sock_hold(connection_sk);
+ }
-+ else
++ else /* It might be a connected socket */
+ connection_sk = inet_lookup_established(&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_nid;
-+ if (connection_sk->sk_nid != 0)
-+ mark = connection_sk->sk_nid;
++
++ if (connection_sk /* Well, some kind of TCP socket */) {
++ if (connection_sk->sk_peercred.uid == 0 || connection_sk->sk_peercred.uid == (__u32) -1) {
++ /* Normal case - the peercred on the socket is not set */
++ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[!dir];
++ }
++ else /* Exceptional case - the peercred was set using SET_PEERCRED. Somebody wants us
++ to mark packets with some arbitrary value.*/
++ mark=connection_sk->sk_peercred.uid;
++
++ /* Has this connection already been tagged? */
++ if (ct->xid[dir] < 1) {
++ /* No - let's tag it */
++ ct->xid[dir]=connection_sk->sk_nid;
++ }
++
++ if (mark==-1 && (connection_sk->sk_nid != 0))
++ mark = ct->xid[dir];
++
++
+ if (connection_sk->sk_state == TCP_TIME_WAIT) {
+ inet_twsk_put(inet_twsk(connection_sk));
+ break;
+ else
+ sock_put(connection_sk);
+ }
-+ else
-+ mark = -1 ;
++
++ /* Covers CoDemux case */
++ if (mark < 1 && (ct->xid[dir]>0)) {
++ mark = ct->xid[dir];
+ }
+
++ if (mark < 1 && (ct->xid[!dir]>0)) {
++ mark = ct->xid[!dir];
++ }
++
++ /* All else failed. Is this a connection over raw sockets? That explains
++ * why we couldn't get anything out of skb->sk, or look up a "real" connection.*/
++ if (ct->xid[dir]<1) {
++ if ((*pskb)->skb_tag) {
++ ct->xid[dir]=(*pskb)->skb_tag;
++ }
++ }
+ }
+ break;
+ }
+ }
+
+ curtag=&__get_cpu_var(sknid_elevator);
-+ if (mark > 0 && *curtag==-2)
++ if (mark > 0 && *curtag==-2 && hooknum==NF_IP_LOCAL_IN)
+ {
-+ printk(KERN_CRIT "Setting mark on packet %x\n", *pskb);
+ *curtag = mark;
+ }
return XT_CONTINUE;
static int
checkentry_v0(const char *tablename,
const void *entry,
-@@ -92,7 +216,8 @@
+@@ -92,7 +245,8 @@
if (markinfo->mode != XT_MARK_SET
&& markinfo->mode != XT_MARK_AND
return 0;
diff -Nurb linux-2.6.22-521/net/netfilter/xt_SETXID.c linux-2.6.22-522/net/netfilter/xt_SETXID.c
--- linux-2.6.22-521/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-522/net/netfilter/xt_SETXID.c 2008-07-21 16:44:36.000000000 -0400
++++ linux-2.6.22-522/net/netfilter/xt_SETXID.c 2008-07-28 16:36:24.000000000 -0400
@@ -0,0 +1,79 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>