git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50c9fd3)
Deleted a debugging message.
authorSapan Bhatia <sapanb@cs.princeton.edu>
Thu, 31 Jul 2008 18:50:25 +0000 (18:50 +0000)
committerSapan Bhatia <sapanb@cs.princeton.edu>
Thu, 31 Jul 2008 18:50:25 +0000 (18:50 +0000)
linux-2.6-522-iptables-connection-tagging.patch patch | blob | history

diff --git a/linux-2.6-522-iptables-connection-tagging.patch b/linux-2.6-522-iptables-connection-tagging.patch
index 802a6ca..5d088da 100644 (file)
--- a/linux-2.6-522-iptables-connection-tagging.patch
+++ b/linux-2.6-522-iptables-connection-tagging.patch
@@ -110,7 +110,7 @@ diff -Nurb linux-2.6.22-521/net/netfilter/nf_conntrack_core.c linux-2.6.22-522/n
  
 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
  
 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-30 14:28:03.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
 @@ -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
@@ -212,7 +212,7 @@ diff -Nurb linux-2.6.22-521/net/netfilter/xt_MARK.c linux-2.6.22-522/net/netfilt
  
        switch (markinfo->mode) {
        case XT_MARK_SET:
  
        switch (markinfo->mode) {
        case XT_MARK_SET:
-@@ -58,13 +122,103 @@
+@@ -58,13 +122,102 @@
        case XT_MARK_OR:
                mark = (*pskb)->mark | markinfo->mark;
                break;
        case XT_MARK_OR:
                mark = (*pskb)->mark | markinfo->mark;
                break;
@@ -258,7 +258,6 @@ diff -Nurb linux-2.6.22-521/net/netfilter/xt_MARK.c linux-2.6.22-522/net/netfilt
 +                            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];
 +                            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];
-+                                    printk(KERN_CRIT "Setting peercred to %d\n",connection_sk->sk_peercred.uid);
 +                            }
 +                            else    /* Exceptional case - the peercred was set using SET_PEERCRED. Somebody wants us
 +                                       to mark packets with some arbitrary value.*/
 +                            }
 +                            else    /* Exceptional case - the peercred was set using SET_PEERCRED. Somebody wants us
 +                                       to mark packets with some arbitrary value.*/
@@ -317,7 +316,7 @@ diff -Nurb linux-2.6.22-521/net/netfilter/xt_MARK.c linux-2.6.22-522/net/netfilt
  static int
  checkentry_v0(const char *tablename,
              const void *entry,
  static int
  checkentry_v0(const char *tablename,
              const void *entry,
-@@ -92,7 +246,8 @@
+@@ -92,7 +245,8 @@
  
        if (markinfo->mode != XT_MARK_SET
            && markinfo->mode != XT_MARK_AND
  
        if (markinfo->mode != XT_MARK_SET
            && markinfo->mode != XT_MARK_AND
linux-2.6